From cb4f5b49074ae71944376b6f9439cb5bf0aadb4b Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sat, 6 Jul 2019 13:37:18 +0800
Subject: [PATCH] updated DialogDemo

---
 .../HandyControlDemo_Shared.projitems         |  7 ++++
 .../Properties/Langs/Lang.Designer.cs         |  9 +++++
 .../Properties/Langs/Lang.en.resx             |  3 ++
 .../Properties/Langs/Lang.resx                |  3 ++
 .../UserControl/Basic/ChatBox.xaml            |  2 +-
 .../UserControl/Basic/InteractiveDialog.xaml  |  2 +-
 .../Basic/InteractiveDialog.xaml.cs           |  2 +-
 .../Basic/TextDialogWithTimer.xaml            | 18 +++++++++
 .../Basic/TextDialogWithTimer.xaml.cs         | 24 ++++++++++++
 .../UserControl/Controls/DialogDemoCtl.xaml   |  1 +
 .../Basic/InteractiveDialogViewModel.cs       |  3 +-
 .../ViewModel/Controls/DialogDemoViewModel.cs | 39 ++++++++++++-------
 12 files changed, 96 insertions(+), 17 deletions(-)
 create mode 100644 src/Shared/HandyControlDemo_Shared/UserControl/Basic/TextDialogWithTimer.xaml
 create mode 100644 src/Shared/HandyControlDemo_Shared/UserControl/Basic/TextDialogWithTimer.xaml.cs

diff --git a/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems b/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems
index a97f4544..0e7f7718 100644
--- a/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems
+++ b/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems
@@ -45,6 +45,9 @@
     <Compile Include="$(MSBuildThisFileDirectory)UserControl\Basic\TextDialog.xaml.cs">
       <DependentUpon>TextDialog.xaml</DependentUpon>
     </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)UserControl\Basic\TextDialogWithTimer.xaml.cs">
+      <DependentUpon>TextDialogWithTimer.xaml</DependentUpon>
+    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)UserControl\Controls\AnimationPathDemoCtl.xaml.cs">
       <DependentUpon>AnimationPathDemoCtl.xaml</DependentUpon>
     </Compile>
@@ -405,6 +408,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)UserControl\Basic\TextDialogWithTimer.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)UserControl\Controls\AnimationPathDemoCtl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs
index a358c168..1ef33d47 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs
@@ -1410,6 +1410,15 @@ namespace HandyControlDemo.Properties.Langs {
             }
         }
         
+        /// <summary>
+        ///   查找类似 文本对话框，带计时器 的本地化字符串。
+        /// </summary>
+        public static string TextDialogWithTimer {
+            get {
+                return ResourceManager.GetString("TextDialogWithTimer", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 时间条 的本地化字符串。
         /// </summary>
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx
index e20eda66..4298ede4 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx
@@ -624,4 +624,7 @@
   <data name="Card" xml:space="preserve">
     <value>Card</value>
   </data>
+  <data name="TextDialogWithTimer" xml:space="preserve">
+    <value>TextDialog with timer</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx
index 04bf9e02..e5cabbbb 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx
@@ -624,4 +624,7 @@
   <data name="Card" xml:space="preserve">
     <value>卡片</value>
   </data>
+  <data name="TextDialogWithTimer" xml:space="preserve">
+    <value>文本对话框，带计时器</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Basic/ChatBox.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Basic/ChatBox.xaml
index 6b22e2ef..2615146f 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Basic/ChatBox.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Basic/ChatBox.xaml
@@ -37,7 +37,7 @@
                 </Grid.ColumnDefinitions>
                 <ToggleButton Name="ToggleButtonAudio" hc:BorderElement.CornerRadius="15" Width="30" Height="30" Padding="7" Margin="6" hc:IconSwitchElement.Geometry="{StaticResource AudioGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource KeyboardGeometry}" Style="{StaticResource ToggleButtonIcon}"/>
                 <Button Command="{Binding OpenImageCmd}" Grid.Column="2" Margin="6,0,6,0" hc:BorderElement.CornerRadius="15" Width="30" Height="30" Padding="7" hc:IconElement.Geometry="{StaticResource ImageGeometry}"/>
-                <TextBox Grid.Column="1" Text="{Binding ChatString,UpdateSourceTrigger=PropertyChanged}" Visibility="{Binding IsChecked,ElementName=ToggleButtonAudio,Converter={StaticResource Boolean2VisibilityReConverter}}">
+                <TextBox VerticalAlignment="Center" Grid.Column="1" Text="{Binding ChatString,UpdateSourceTrigger=PropertyChanged}" Visibility="{Binding IsChecked,ElementName=ToggleButtonAudio,Converter={StaticResource Boolean2VisibilityReConverter}}">
                     <hc:Interaction.Triggers>
                         <hc:EventTrigger EventName="KeyDown">
                             <hc:EventToCommand Command="{Binding SendStringCmd}" PassEventArgsToCommand="True" />
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Basic/InteractiveDialog.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Basic/InteractiveDialog.xaml
index 161cb16a..223780ec 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Basic/InteractiveDialog.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Basic/InteractiveDialog.xaml
@@ -1,4 +1,4 @@
-<Border x:Class="HandyControlDemo.UserControl.Basic.InteractiveDialog"
+<Border x:Class="HandyControlDemo.UserControl.InteractiveDialog"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Basic/InteractiveDialog.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Basic/InteractiveDialog.xaml.cs
index 0e9ac1a0..393fa350 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Basic/InteractiveDialog.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Basic/InteractiveDialog.xaml.cs
@@ -1,4 +1,4 @@
-namespace HandyControlDemo.UserControl.Basic
+namespace HandyControlDemo.UserControl
 {
     public partial class InteractiveDialog
     {
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Basic/TextDialogWithTimer.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Basic/TextDialogWithTimer.xaml
new file mode 100644
index 00000000..e3bf7a7c
--- /dev/null
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Basic/TextDialogWithTimer.xaml
@@ -0,0 +1,18 @@
+<Border x:Class="HandyControlDemo.UserControl.TextDialogWithTimer"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
+        xmlns:hc="https://handyorg.github.io/handycontrol"
+        CornerRadius="10"
+        Width="400"
+        Height="247"
+        DataContext="{Binding InteractiveDialog, Source={StaticResource Locator}}"
+        Background="{DynamicResource RegionBrush}">
+    <hc:SimplePanel>
+        <Viewbox Width="80" Height="80">
+            <TextBlock TextWrapping="Wrap" Style="{StaticResource TextBlockLargeBold}" Text="{x:Static langs:Lang.PleaseWait}"/>
+        </Viewbox>
+        <Button Name="ButtonClose" Width="22" Height="22" Command="{Binding CloseCmd}" Style="{StaticResource ButtonIcon}" Foreground="{DynamicResource PrimaryBrush}" hc:IconElement.Geometry="{StaticResource ErrorGeometry}" Padding="0" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,4,4,0"/>
+        <hc:CircleProgressBar Name="ProgressBarTimer" ShowText="False" Width="120" Height="120"/>
+    </hc:SimplePanel>
+</Border>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Basic/TextDialogWithTimer.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Basic/TextDialogWithTimer.xaml.cs
new file mode 100644
index 00000000..73765ea6
--- /dev/null
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Basic/TextDialogWithTimer.xaml.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Windows.Controls.Primitives;
+using HandyControl.Tools;
+
+namespace HandyControlDemo.UserControl
+{
+    public partial class TextDialogWithTimer
+    {
+        public TextDialogWithTimer()
+        {
+            InitializeComponent();
+
+            var animation = AnimationHelper.CreateAnimation(100, 5000);
+            animation.EasingFunction = null;
+            animation.Completed += Animation_Completed;
+            ProgressBarTimer.BeginAnimation(RangeBase.ValueProperty, animation);
+        }
+
+        private void Animation_Completed(object sender, EventArgs e)
+        {
+            ButtonClose.Command.Execute(null);
+        }
+    }
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DialogDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DialogDemoCtl.xaml
index 21072d9a..c8973990 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DialogDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DialogDemoCtl.xaml
@@ -9,6 +9,7 @@
     <hc:TransitioningContentControl>
         <StackPanel Margin="32" VerticalAlignment="Center">
             <Button Content="{x:Static langs:Lang.TextDialog}" Command="{Binding ShowTextCmd}" />
+            <Button Margin="0,32,0,0" Content="{x:Static langs:Lang.TextDialogWithTimer}" Command="{Binding ShowInteractiveDialogCmd}" CommandParameter="True"/>
             <TextBox Margin="0,32,0,0" Text="{Binding DialogResult,UpdateSourceTrigger=PropertyChanged}" Style="{StaticResource TextBoxExtend}" hc:InfoElement.Placeholder="{x:Static langs:Lang.PleaseInput}"/>
             <Button Margin="0,10,0,0" Content="{x:Static langs:Lang.InteractiveDialog}" Command="{Binding ShowInteractiveDialogCmd}"/>
             <Button Margin="0,32,0,0" Content="{x:Static langs:Lang.NewWindow}" Command="{Binding NewWindowCmd}"/>
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Basic/InteractiveDialogViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Basic/InteractiveDialogViewModel.cs
index 30efe414..947ee7bc 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/Basic/InteractiveDialogViewModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Basic/InteractiveDialogViewModel.cs
@@ -6,6 +6,7 @@ using GalaSoft.MvvmLight.Command;
 using GalaSoft.MvvmLight.CommandWpf;       
 #endif
 using HandyControl.Tools.Extension;
+using HandyControlDemo.Data;
 
 namespace HandyControlDemo.ViewModel.Basic
 {
@@ -37,6 +38,6 @@ namespace HandyControlDemo.ViewModel.Basic
 #endif
         }
 
-        public RelayCommand CloseCmd => new Lazy<RelayCommand>(() => new RelayCommand(() => CloseAction?.Invoke(""))).Value;
+        public RelayCommand CloseCmd => new Lazy<RelayCommand>(() => new RelayCommand(() => CloseAction?.Invoke(MessageToken.MainWindow))).Value;
     }
 }
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/DialogDemoViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/DialogDemoViewModel.cs
index 4b6910a8..89bc2d92 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/DialogDemoViewModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/DialogDemoViewModel.cs
@@ -10,7 +10,6 @@ using GalaSoft.MvvmLight.CommandWpf;
 using HandyControl.Controls;
 using HandyControl.Tools.Extension;
 using HandyControlDemo.UserControl;
-using HandyControlDemo.UserControl.Basic;
 using HandyControlDemo.ViewModel.Basic;
 using HandyControlDemo.Window;
 
@@ -39,24 +38,38 @@ namespace HandyControlDemo.ViewModel
         }
 
 #if netle40
-        public RelayCommand ShowInteractiveDialogCmd => new Lazy<RelayCommand>(() =>
-            new RelayCommand(ShowInteractiveDialog)).Value;
+        public RelayCommand<bool> ShowInteractiveDialogCmd => new Lazy<RelayCommand<bool>>(() =>
+            new RelayCommand<bool>(ShowInteractiveDialog)).Value;
 
-        private void ShowInteractiveDialog()
+        private void ShowInteractiveDialog(bool withTimer)
         {
-            Dialog.Show<InteractiveDialog>()
-                .Initialize<InteractiveDialogViewModel>(vm => vm.Message = DialogResult)
-                .GetResultAsync<string>().ContinueWith(str => DialogResult = str.Result);
+            if (!withTimer)
+            {
+                Dialog.Show<InteractiveDialog>()
+                    .Initialize<InteractiveDialogViewModel>(vm => vm.Message = DialogResult)
+                    .GetResultAsync<string>().ContinueWith(str => DialogResult = str.Result);
+            }
+            else
+            {
+                Dialog.Show<TextDialogWithTimer>().GetResultAsync<string>();
+            }
         }
 #else
-        public RelayCommand ShowInteractiveDialogCmd => new Lazy<RelayCommand>(() =>
-            new RelayCommand(async () => await ShowInteractiveDialog())).Value;
+        public RelayCommand<bool> ShowInteractiveDialogCmd => new Lazy<RelayCommand<bool>>(() =>
+            new RelayCommand<bool>(async withTimer => await ShowInteractiveDialog(withTimer))).Value;
 
-        private async Task ShowInteractiveDialog()
+        private async Task ShowInteractiveDialog(bool withTimer)
         {
-            DialogResult = await Dialog.Show<InteractiveDialog>()
-                .Initialize<InteractiveDialogViewModel>(vm => vm.Message = DialogResult)
-                .GetResultAsync<string>();
+            if (!withTimer)
+            {
+                DialogResult = await Dialog.Show<InteractiveDialog>()
+                    .Initialize<InteractiveDialogViewModel>(vm => vm.Message = DialogResult)
+                    .GetResultAsync<string>();
+            }
+            else
+            {
+                await Dialog.Show<TextDialogWithTimer>().GetResultAsync<string>();
+            }
         }
 #endif