Browse Source

front page reversion backup

Robert 1 year ago
parent
commit
f5d907fa82

+ 19 - 0
Bellwether/Bellwether.csproj

@@ -87,11 +87,21 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Compile Include="BellwetherAPI\BellwetherAPI.cs" />
+    <Compile Include="BellwetherAPI\Model\SolarenergyCapacityModel.cs" />
+    <Compile Include="BellwetherAPI\Model\SolarEnergyModel.cs" />
+    <Compile Include="BellwetherAPI\Model\TitleModel.cs" />
     <Compile Include="CustomTrigger\TouchDownTrigger.cs" />
     <Compile Include="EdgeGestureUtil.cs" />
+    <Compile Include="HiddenExitWindow.xaml.cs">
+      <DependentUpon>HiddenExitWindow.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Pages\ucHistoryHW.xaml.cs">
       <DependentUpon>ucHistoryHW.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Pages\ucScreenSavePage.xaml.cs">
+      <DependentUpon>ucScreenSavePage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="ucMainControlPage.xaml.cs">
       <DependentUpon>ucMainControlPage.xaml</DependentUpon>
     </Compile>
@@ -112,6 +122,10 @@
     <Compile Include="Utility\SbAssist.cs" />
     <Compile Include="Utility\Setting.cs" />
     <Compile Include="Utility\UpdateProcess.cs" />
+    <Page Include="HiddenExitWindow.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -132,6 +146,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Pages\ucScreenSavePage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="ucMainControlPage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -384,5 +402,6 @@
       <Name>VideoPlayer</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

+ 94 - 0
Bellwether/BellwetherAPI/BellwetherAPI.cs

@@ -0,0 +1,94 @@
+using Bellwether.Model;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+
+namespace Bellwether
+{
+    public class BellwetherAPI
+    {
+        public async Task<List<SolarEnergyModel>> GetSolarenergy()
+        {
+            var url = "http://plm.bellwether-corp.com:8081/BW_Service.asmx/ExportSolarenergy_All_1";
+            var result = await CallApi<SolarEnergyRawModel>(url);
+            if (result == null)
+            {
+                return new List<SolarEnergyModel>();
+            }
+            var toReturn = new List<SolarEnergyModel>();
+            foreach(var rawData in result)
+            {
+                var parseResult = SolarEnergyModel.Parse(rawData);
+                if (string.IsNullOrEmpty(parseResult.Area))
+                    continue;
+                toReturn.Add(parseResult);
+            }
+            return toReturn;
+        }
+
+        public async Task<List<SolarenergyCapacityModel>> GetSolarenergyCapacity()
+        {
+            var url = "http://plm.bellwether-corp.com:8081/BW_Service.asmx/ExportSolarenergy_All_2";
+            var result = await CallApi<SolarenergyCapacityRawModel>(url);
+            if (result == null)
+            {
+                return new List<SolarenergyCapacityModel>();
+            }
+            var toReturn = new List<SolarenergyCapacityModel>();
+            foreach (var rawData in result)
+            {
+                var parseResult = SolarenergyCapacityModel.Parse(rawData);
+                if (string.IsNullOrEmpty(parseResult.Area))
+                    continue;
+                toReturn.Add(parseResult);
+            }
+            return toReturn;
+        }
+
+        public async Task<TitleModel> GetSolarenergyTitle1()
+        {
+            var url = "http://plm.bellwether-corp.com:8081/BW_Service.asmx/ExportSolarenergy_All_3";
+            var result = await CallApi<TitleRawModel>(url);
+            if (result == null || result.Count() == 0)
+            {
+                return new TitleModel();
+            }
+            return TitleModel.Parse(result[0]);
+        }
+
+        public async Task<TitleModel> GetSolarenergyTitle2()
+        {
+            var url = "http://plm.bellwether-corp.com:8081/BW_Service.asmx/ExportSolarenergy_All_4";
+            var result = await CallApi<TitleRawModel>(url);
+            if (result == null || result.Count() == 0)
+            {
+                return new TitleModel();
+            }
+            return TitleModel.Parse(result[0]);
+        }
+
+        private async Task<T[]> CallApi<T>(string url)
+        {
+            var result = await new HttpClient().GetStringAsync(url);
+            Regex regex = new Regex(".*\"data\":(\\[.*\\]).*");
+            var matchResult = regex.Match(result);
+            if (matchResult == null || !matchResult.Success || matchResult.Groups.Count <= 1)
+            {
+                return null;
+            }
+            try
+            {
+                return JsonConvert.DeserializeObject<T[]>(matchResult.Groups[1].Value);
+            }
+            catch
+            {
+                return null;
+            }
+        }
+    }
+}

+ 45 - 0
Bellwether/BellwetherAPI/Model/SolarEnergyModel.cs

@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Bellwether.Model
+{
+    public class SolarEnergyModel
+    {
+        public string Area { get; set; }
+        public long Energy { get; set; }
+        public long CO2EmissionSaved { get; set; }
+        public long EquivalentTreesPlanted { get; set; }
+
+        public static SolarEnergyModel Parse(SolarEnergyRawModel rawModel)
+        {
+            if (rawModel == null)
+            {
+                return new SolarEnergyModel();
+            }
+            if (!long.TryParse(rawModel.Energy, out var energy) ||
+                !long.TryParse(rawModel.CO2EmissionSaved, out var co2EmissionSaved) ||
+                !long.TryParse(rawModel.EquivalentTreesPlanted, out var equivalentTreesPlanted))
+            {
+                return new SolarEnergyModel();
+            }
+            return new SolarEnergyModel()
+            {
+                Area = rawModel.Area,
+                Energy = energy,
+                CO2EmissionSaved = co2EmissionSaved,
+                EquivalentTreesPlanted = equivalentTreesPlanted
+            };
+        }
+    }
+
+    public class SolarEnergyRawModel
+    {
+        public string Area { get; set; }
+        public string Energy { get; set; }
+        public string CO2EmissionSaved { get; set; }
+        public string EquivalentTreesPlanted { get; set; }
+    }
+}

+ 39 - 0
Bellwether/BellwetherAPI/Model/SolarenergyCapacityModel.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Bellwether.Model
+{
+    public class SolarenergyCapacityModel
+    {
+        public string Area { get; set; }
+        public long Capacity { get; set; }
+
+        public static SolarenergyCapacityModel Parse(SolarenergyCapacityRawModel rawModel)
+        {
+            if (rawModel is null)
+            {
+                return new SolarenergyCapacityModel();
+            }
+
+            if (!long.TryParse(rawModel.Capacity, out var capacity))
+            {
+                return new SolarenergyCapacityModel();
+            }
+
+            return new SolarenergyCapacityModel()
+            {
+                Area = rawModel.Area,
+                Capacity = capacity
+            };
+        }
+    }
+
+    public class SolarenergyCapacityRawModel
+    {
+        public string Area { get; set; }
+        public string Capacity { get; set; }
+    }
+}

+ 39 - 0
Bellwether/BellwetherAPI/Model/TitleModel.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Bellwether.Model
+{
+    public class TitleModel
+    {
+        public string Title { get; set; }
+        public long Content { get; set; }
+
+        public static TitleModel Parse(TitleRawModel rawModel)
+        {
+            if ( rawModel == null)
+            {
+                return new TitleModel();
+            }
+
+            if (!long.TryParse(rawModel.Content, out var content))
+            {
+                return new TitleModel();
+            }
+
+            return new TitleModel()
+            {
+                Title = rawModel.Title,
+                Content = content
+            };
+        }
+    }
+
+    public class TitleRawModel
+    {
+        public string Title { get; set; }
+        public string Content { get; set; }
+    }
+}

+ 17 - 0
Bellwether/HiddenExitWindow.xaml

@@ -0,0 +1,17 @@
+<Window x:Class="Bellwether.HiddenExitWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:Bellwether"
+        mc:Ignorable="d"
+        WindowStyle="None"
+        Title="HiddenExit" Height="100" Width="100"
+        WindowStartupLocation="Manual"
+        AllowsTransparency="True"
+        Left="0"
+        Top="0"
+        MouseDown="Window_MouseDown"
+        Topmost="True"
+        >
+</Window>

+ 61 - 0
Bellwether/HiddenExitWindow.xaml.cs

@@ -0,0 +1,61 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Interop;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace Bellwether
+{
+    /// <summary>
+    /// Interaction logic for HiddenExit.xaml
+    /// </summary>
+    public partial class HiddenExitWindow : Window
+    {
+        public HiddenExitWindow()
+        {
+            InitializeComponent();
+
+            Loaded += HiddenExitWindow_Loaded;
+        }
+
+        private void Grid_TouchDown(object sender, TouchEventArgs e)
+        {
+
+        }
+
+        private void Window_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            App.Current.Shutdown();
+        }
+
+        private static readonly IntPtr HWND_TOPMOST = new IntPtr(-1);
+        private const UInt32 SWP_NOSIZE = 0x0001;
+        private const UInt32 SWP_NOMOVE = 0x0002;
+        private const UInt32 TOPMOST_FLAGS = SWP_NOMOVE | SWP_NOSIZE;
+
+        [DllImport("user32.dll")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        public static extern bool SetWindowPos(IntPtr hWnd, IntPtr hWndInsertAfter, int X, int Y, int cx, int cy, uint uFlags);
+
+
+        private void HiddenExitWindow_Loaded(object sender, RoutedEventArgs e)
+        {
+            SetWindowPos(new WindowInteropHelper(this).Handle, HWND_TOPMOST, 0, 0, 0, 0, TOPMOST_FLAGS);
+        }
+
+        private void Sample2_Deactivated(object sender, EventArgs e)
+        {
+            SetWindowPos(new WindowInteropHelper(this).Handle, HWND_TOPMOST, 0, 0, 0, 0, TOPMOST_FLAGS);
+        }
+    }
+}

BIN
Bellwether/Images/Historywall/menu_01.png


BIN
Bellwether/Images/Historywall/menu_02.png


BIN
Bellwether/Images/Historywall/menu_03.png


BIN
Bellwether/Images/Historywall/menu_bg.png


BIN
Bellwether/Images/Home_menu_01.png


BIN
Bellwether/Images/Home_menu_02.png


BIN
Bellwether/Images/Home_menu_03.png


+ 2 - 0
Bellwether/MainWindow.xaml

@@ -14,6 +14,8 @@
     WindowStartupLocation="CenterScreen"
     WindowStyle="None"
     mc:Ignorable="d"
+    Topmost="True"
+    WindowState="Maximized"
     x:Class="Bellwether.MainWindow">
     <Window.Resources>
         <Storyboard x:Key="HideStoryboard">

+ 1 - 0
Bellwether/MainWindow.xaml.cs

@@ -24,6 +24,7 @@ namespace Bellwether
         History,
         Product,
         CSR,
+        ScreenSave,
     }
 
     /// <summary>

+ 19 - 1
Bellwether/Pages/ucFrontPage.xaml

@@ -390,7 +390,7 @@
                     Margin="1559,0,0,282"
                     HorizontalAlignment="Left"
                     VerticalAlignment="Bottom"
-                    Text="千棵樹年減碳量"
+                    Text="棵樹日減碳量"
                     FontSize="34"
                     FontFamily="Microsoft JhengHei UI"
                     Spaceing="-12" />
@@ -723,6 +723,24 @@
                 Background="Transparent"
                 Tag="0"
                 TouchDown="HiddenButton2_TouchDown" />
+            <Grid
+                Width="100"
+                Height="100"
+                Margin="702,280,0,0"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Top"
+                Background="Transparent"
+                Tag="0"
+                TouchDown="HiddenButton2_TouchDown" />
+            <Grid
+                Width="100"
+                Height="100"
+                Margin="830,277,0,0"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Top"
+                Background="Transparent"
+                Tag="0"
+                TouchDown="HiddenButton2_TouchDown" />
         </Grid>
     </UserControl.Content>
 </UserControl>

+ 10 - 4
Bellwether/Pages/ucFrontPage.xaml.cs

@@ -118,11 +118,11 @@ namespace Bellwether.Pages
 
             uxEnergy_Today.Text = solarInfo.Energy_Today.ToString("#,##0");
             uxCO2EmissionSaved_Today.Text = solarInfo.CO2EmissionSaved_Today.ToString("#,##0");
-            uxEquivalentTreesPlanted_Today.Text = solarInfo.EquivalentTreesPlanted_Today.ToString("#,##0");
+            uxEquivalentTreesPlanted_Today.Text = ((int)solarInfo.EquivalentTreesPlanted_Today).ToString("#,##0");
 
             uxEnergy_ThisYear.Text = solarInfo.Energy_ThisYear.ToString("#,##0");
             uxCO2EmissionSaved_ThisYear.Text = solarInfo.CO2EmissionSaved_ThisYear.ToString("#,##0");
-            uxEquivalentTreesPlanted_ThisYear.Text = solarInfo.EquivalentTreesPlanted_ThisYear.ToString("#,##0");
+            uxEquivalentTreesPlanted_ThisYear.Text = (solarInfo.EquivalentTreesPlanted_ThisYear * 360 * 1000).ToString("#,##0");
         }
 
         private void UpdateDateTimeInfo()
@@ -220,7 +220,8 @@ namespace Bellwether.Pages
             {
                 hiddenStageTimer.Stop();
                 hiddenStage = 0;
-                ExecuteExternal();
+                //ExecuteExternal();
+                ChangeToScreenSavePage();
             }
 
             void TryInitTimer()
@@ -230,7 +231,7 @@ namespace Bellwether.Pages
                     return;
                 }
 
-                hiddenStageTimer = new Timer() { Interval = 100 };
+                hiddenStageTimer = new Timer() { Interval = 1000 };
                 hiddenStageTimer.Elapsed += (sender2, e2) => {
                     hiddenStage = 0;
                     hiddenStageTimer.Stop();
@@ -252,6 +253,11 @@ namespace Bellwether.Pages
                 }
                 uxMediaViewer.Play();
             }
+
+            async void ChangeToScreenSavePage()
+            {
+                GoPageRequested?.Invoke(this, PageType.ScreenSave);
+            }
         }
 
         int hiddenStage2 = 0;

+ 22 - 0
Bellwether/Pages/ucScreenSavePage.xaml

@@ -0,0 +1,22 @@
+<UserControl
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:Bellwether.Pages"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d"
+    x:Class="Bellwether.Pages.ucScreenSavePage">
+    <Grid>
+        <Grid x:Name="uxVideoPanel" />
+        <Grid
+            Width="100"
+            Height="100"
+            HorizontalAlignment="Left"
+            VerticalAlignment="Bottom"
+            Background="Transparent"
+            Tag="0"
+            TouchDown="HiddenButton2_TouchDown" />
+    </Grid>
+</UserControl>

+ 150 - 0
Bellwether/Pages/ucScreenSavePage.xaml.cs

@@ -0,0 +1,150 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Timers;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+
+namespace Bellwether.Pages
+{
+    /// <summary>
+    /// Interaction logic for ucScreenSavePage.xaml
+    /// </summary>
+    public partial class ucScreenSavePage : UserControl
+    {
+        public ucScreenSavePage()
+        {
+            InitializeComponent();
+
+            Loaded += UcScreenSavePage_Loaded;
+        }
+
+        private static string ScreenSaveMov = "ScreenSave.mp4";
+
+        public event EventHandler<PageType> GoPageRequested;
+
+        private MediaTimeline mt;
+        private MediaElement mediaSource;
+
+        private Process PlayerProcess;
+
+        private void UcScreenSavePage_Loaded(object sender, RoutedEventArgs e)
+        {
+            //StartMediaPlayer();
+            //StartHiddenExitWindow();
+
+            AddVideo();
+        }
+
+        private void StartHiddenExitWindow()
+        {
+            HiddenExitWindow HiddenExitWindow = new HiddenExitWindow();
+            HiddenExitWindow.Closed += HiddenExitWindow_Closed;
+            HiddenExitWindow.Show();
+        }
+
+        private void HiddenExitWindow_Closed(object sender, EventArgs e)
+        {
+            PlayerProcess.Close();
+            GoPageRequested?.Invoke(this, PageType.FrontPage);
+        }
+
+        private void StartMediaPlayer()
+        {
+            var psi = new ProcessStartInfo()
+            {
+                FileName = "C:\\Program Files (x86)\\K-Lite Codec Pack\\MPC-HC64\\mpc-hc64.exe",
+                Arguments = ".\\ScreenSave.mp4",
+            };
+            PlayerProcess = new Process() { EnableRaisingEvents = true };
+            PlayerProcess.Exited += P_Exited;
+            PlayerProcess.StartInfo = psi;
+            PlayerProcess.Start();
+        }
+
+        private void P_Exited(object sender, EventArgs e)
+        {
+            GoPageRequested?.Invoke(this, PageType.FrontPage);
+        }
+
+        private void AddVideo()
+        {
+
+            mediaSource = new MediaElement();
+            mt = new MediaTimeline(new Uri(Path.GetFullPath(ScreenSaveMov)));
+            mediaSource.Clock = mt.CreateClock();
+            //mediaSource.Clock.CurrentTimeInvalidated += media_CurrentTimeInvalidated;
+            mediaSource.Clock.Completed += Video_Completed;
+            mediaSource.LoadedBehavior = MediaState.Play;
+            mediaSource.MediaOpened += MediaSource_MediaOpened;
+            mediaSource.VerticalAlignment = VerticalAlignment.Bottom;
+            RenderOptions.SetBitmapScalingMode(mediaSource, BitmapScalingMode.HighQuality);
+            //mediaSource.Margin = new Thickness(0, -10, 0, -10);
+
+            uxVideoPanel.Children.Add(mediaSource);
+        }
+
+        private void Video_Completed(object sender, EventArgs e)
+        {
+            Play();
+        }
+
+        private void MediaSource_MediaOpened(object sender, RoutedEventArgs e)
+        {
+            Play();
+        }
+
+        private void Play()
+        {
+            mediaSource.Clock.Controller.Stop();
+            mediaSource.Clock.Controller.Begin();
+        }
+
+        int hiddenStage2 = 0;
+        Timer hiddenStage2Timer;
+        private void HiddenButton2_TouchDown(object sender, TouchEventArgs e)
+        {
+            GoPageRequested(this, PageType.FrontPage);
+            return;
+
+            TryInitTimer();
+
+            hiddenStage2++;
+            if (hiddenStage2 == 1)
+            {
+                hiddenStage2Timer.Start();
+            }
+            if (hiddenStage2 == 2)
+            {
+                hiddenStage2Timer.Stop();
+                hiddenStage2 = 0;
+                GoPageRequested(this, PageType.FrontPage);
+            }
+
+            void TryInitTimer()
+            {
+                if (hiddenStage2Timer != null)
+                {
+                    return;
+                }
+
+                hiddenStage2Timer = new Timer() { Interval = 1000 };
+                hiddenStage2Timer.Elapsed += (sender2, e2) => {
+                    hiddenStage2 = 0;
+                    hiddenStage2Timer.Stop();
+                };
+            }
+        }
+    }
+}

+ 1 - 1
Bellwether/Utility/Setting.cs

@@ -10,7 +10,7 @@ namespace Bellwether.Utility
 {
     public static class Setting
     {
-        public static readonly List<string> PageNameList = new List<string>() { "大事記", "產品展示", "社會責任" };
+        public static readonly List<string> PageNameList = new List<string>() { "BellWether", "產品展示", "社會責任" };
 
         public static int BackHomeSec { get => settingJsonFile.BackHomeSec; }
         public static string SolarEnergyUrl { get => frontpageJsonFile.SolarEnergyUrl; }

+ 20 - 2
Bellwether/ucMainControlPage.xaml.cs

@@ -82,7 +82,8 @@ namespace Bellwether
 
         private void MainContainterFadeInSb_Completed(object sender, EventArgs e)
         {
-            if (nextPage != PageType.FrontPage)
+            if (nextPage != PageType.FrontPage ||
+                nextPage != PageType.ScreenSave)
                 backHomeTimer.Start();
             else
                 backHomeTimer.Stop();
@@ -98,11 +99,19 @@ namespace Bellwether
             {
                 frontPage.GoPageRequested -= Page_GoPageRequested;
             }
+            if (this.uxMainContainter.Child is Pages.ucScreenSavePage screenSavePage)
+            {
+                screenSavePage.GoPageRequested -= Page_GoPageRequested;
+            }
 
             if (nextPage == PageType.FrontPage)
             {
                 this.uxMainContainter.Child = GetUcFrontPage();
             }
+            else if (nextPage == PageType.ScreenSave)
+            {
+                this.uxMainContainter.Child = GetUcScreenSavePage();
+            }
             else
             {
                 this.uxMainContainter.Child = CreateHistoryUc(nextPage);
@@ -114,7 +123,9 @@ namespace Bellwether
         private void Page_GoPageRequested(object sender, PageType e)
         {
             nextPage = e;
-            mainContainterFadeOutSb.Begin();
+            Dispatcher.Invoke(() => { 
+                mainContainterFadeOutSb.Begin();
+            });
         }
 
         private Pages.ucHistoryHW CreateHistoryUc(PageType type)
@@ -139,5 +150,12 @@ namespace Bellwether
             frontPage.GoPageRequested += Page_GoPageRequested;
             return frontPage;
         }
+
+        private Pages.ucScreenSavePage GetUcScreenSavePage()
+        {
+            var screenSavePage = new Pages.ucScreenSavePage();
+            screenSavePage.GoPageRequested += Page_GoPageRequested;
+            return screenSavePage;
+        }
     }
 }

+ 3 - 3
BellwetherBackend/MainWindow.xaml

@@ -36,15 +36,15 @@
                     Style="{StaticResource uxTopRadioButton}" />
                 <RadioButton
                     Checked="RadioButton_Checked"
-                    Content="大事記"
+                    Content="BellWether"
                     Style="{StaticResource uxTopRadioButton}" />
                 <RadioButton
                     Checked="RadioButton_Checked"
-                    Content="產品展示"
+                    Content="產品簡介"
                     Style="{StaticResource uxTopRadioButton}" />
                 <RadioButton
                     Checked="RadioButton_Checked"
-                    Content="最新消息"
+                    Content="企業永續"
                     Style="{StaticResource uxTopRadioButton}" />
                 <RadioButton
                     Checked="RadioButton_Checked"

+ 3 - 3
BellwetherBackend/SubPage/UpdatePage.xaml

@@ -54,7 +54,7 @@
                     FontSize="30"
                     IsChecked="True"
                     Tag="History">
-                    大事紀
+                    BellWether
                 </CheckBox>
                 <CheckBox
                     Width="280"
@@ -62,7 +62,7 @@
                     FontSize="30"
                     IsChecked="True"
                     Tag="Product">
-                    產品展示
+                    產品簡介
                 </CheckBox>
                 <CheckBox
                     Width="280"
@@ -70,7 +70,7 @@
                     FontSize="30"
                     IsChecked="True"
                     Tag="CSR">
-                    最新消息
+                    企業永續
                 </CheckBox>
             </StackPanel>
         </Grid>

+ 1 - 1
BellwetherBackend/Utility/Setting.cs

@@ -15,7 +15,7 @@ namespace BellwetherBackend.Utility
         public static readonly string frontPageDirectory = System.IO.Path.Combine(dataDirectory, "FrontPage");
         public static readonly string frontPageJsonDataPath = System.IO.Path.Combine(frontPageDirectory, "frontpage.ini");
 
-        public static readonly List<string> PageNameList = new List<string>() { "基本設定", "首頁", "大事記", "產品展示", "社會責任" };
+        public static readonly List<string> PageNameList = new List<string>() { "基本設定", "首頁", "BellWether", "產品展示", "社會責任" };
 
         public enum PageType : int
         {