complete the branch

2019-03-31 15:43:55 +08:00
1 parent 6e56c967ce
commit 87d38271e3
@@ -50,6 +50,8 @@ namespace HandyControl.Controls

        private bool _isTransparent;

+        private bool _isDisposed;
+
        static NotifyIcon()
        {
            VisibilityProperty.OverrideMetadata(typeof(NotifyIcon), new PropertyMetadata(Visibility.Visible, OnVisibilityChanged));
@@ -238,7 +240,6 @@ namespace HandyControl.Controls
                    uCallbackMessage = WmTrayMouseMessage,
                    uFlags = NativeMethods.NIF_MESSAGE | NativeMethods.NIF_ICON | NativeMethods.NIF_TIP,
                    hWnd = _messageWindowHandle,
-                    uTimeoutOrVersion = 10,
                    uID = _id,
                    dwInfoFlags = NativeMethods.NIF_TIP,
                    hIcon = isTransparent ? IntPtr.Zero : _currentSmallIconHandle.CriticalGetHandle(),
@@ -284,7 +285,8 @@ namespace HandyControl.Controls

            UnsafeNativeMethods.RegisterClass(wndclass);
            _wmTaskbarCreated = NativeMethods.RegisterWindowMessage("TaskbarCreated");
-            _messageWindowHandle = UnsafeNativeMethods.CreateWindowEx(0, _windowClassName, "", 0, 0, 0, 1, 1, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero);
+            _messageWindowHandle = UnsafeNativeMethods.CreateWindowEx(0, _windowClassName, "", 0, 0, 0, 1, 1,
+                IntPtr.Zero, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero);
        }

        private IntPtr Callback(IntPtr hWnd, int msg, IntPtr wparam, IntPtr lparam)
@@ -302,30 +304,9 @@ namespace HandyControl.Controls
                        case NativeMethods.WM_LBUTTONDBLCLK:
                            WmMouseDown(MouseButton.Left, 2);
                            break;
-                        case NativeMethods.WM_LBUTTONDOWN:
-                            WmMouseDown(MouseButton.Left, 1);
-                            break;
                        case NativeMethods.WM_LBUTTONUP:
                            WmMouseUp(MouseButton.Left);
                            break;
-                        case NativeMethods.WM_MBUTTONDBLCLK:
-                            WmMouseDown(MouseButton.Middle, 2);
-                            break;
-                        case NativeMethods.WM_MBUTTONDOWN:
-                            WmMouseDown(MouseButton.Middle, 1);
-                            break;
-                        case NativeMethods.WM_MBUTTONUP:
-                            WmMouseUp(MouseButton.Middle);
-                            break;
-                        case NativeMethods.WM_MOUSEMOVE:
-                            WmMouseMove();
-                            break;
-                        case NativeMethods.WM_RBUTTONDBLCLK:
-                            WmMouseDown(MouseButton.Right, 2);
-                            break;
-                        case NativeMethods.WM_RBUTTONDOWN:
-                            WmMouseDown(MouseButton.Right, 1);
-                            break;
                        case NativeMethods.WM_RBUTTONUP:
                            ShowContextMenu();
                            WmMouseUp(MouseButton.Right);
@@ -347,20 +328,11 @@ namespace HandyControl.Controls
                });
                _doubleClick = true;
            }
-            RaiseEvent(new MouseButtonEventArgs(Mouse.PrimaryDevice, Environment.TickCount, button)
-            {
-                RoutedEvent = MouseDownEvent
-            });
        }

        private void WmMouseUp(MouseButton button)
        {
-            RaiseEvent(new MouseButtonEventArgs(Mouse.PrimaryDevice, Environment.TickCount, button)
-            {
-                RoutedEvent = MouseUpEvent
-            });
-
-            if (!_doubleClick)
+            if (!_doubleClick && button == MouseButton.Left)
            {
                RaiseEvent(new MouseButtonEventArgs(Mouse.PrimaryDevice, Environment.TickCount, button)
                {
@@ -370,14 +342,6 @@ namespace HandyControl.Controls
            _doubleClick = false;
        }

-        private void WmMouseMove()
-        {
-            RaiseEvent(new MouseEventArgs(Mouse.PrimaryDevice, Environment.TickCount)
-            {
-                RoutedEvent = MouseMoveEvent
-            });
-        }
-
        private void ShowContextMenu()
        {
            var point = new POINT();
@@ -449,6 +413,7 @@ namespace HandyControl.Controls

        private void Dispose(bool disposing)
        {
+            if (_isDisposed) return;
            if (disposing)
            {
                if (_dispatcherTimer != null && IsBlink)
@@ -461,6 +426,8 @@ namespace HandyControl.Controls
                _currentLargeIconHandle?.Dispose();
                _currentSmallIconHandle?.Dispose();
            }
+
+            _isDisposed = true;
        }

        public void Dispose()
@@ -468,5 +435,17 @@ namespace HandyControl.Controls
            Dispose(true);
            GC.SuppressFinalize(this);
        }
+
+        public void CloseContextControl()
+        {
+            if (_contextContent != null)
+            {
+                _contextContent.IsOpen = false;
+            }
+            else if (ContextMenu != null)
+            {
+                ContextMenu.IsOpen = false;
+            }
+        }
    }
 }
@@ -1,10 +0,0 @@
-namespace HandyControl.Data
-{
-    public enum ToolTipIcon
-    {
-        None,
-        Info,
-        Warning,
-        Error
-    }
-}
@@ -1,41 +0,0 @@
-using HandyControl.Tools.Interop;
-using System;
-using System.Diagnostics.CodeAnalysis;
-
-namespace HandyControl.Data
-{
-    public sealed class Icon : IDisposable
-    {
-        private IntPtr _handle;
-
-        ~Icon()
-        {
-            Dispose(false);
-        }
-
-        internal Icon(IntPtr handle)
-        {
-            if (handle == IntPtr.Zero)
-            {
-                throw new ArgumentException("InvalidGDIHandle", typeof(Icon).Name);
-            }
-            _handle = handle;
-        }
-
-        [SuppressMessage("ReSharper", "UnusedParameter.Local")]
-        private void Dispose(bool disposing)
-        {
-            if (_handle != IntPtr.Zero)
-            {
-                UnsafeNativeMethods.DestroyIcon(_handle);
-                _handle = IntPtr.Zero;
-            }
-        }
-
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-    }
-}
@@ -172,13 +172,11 @@
    <Compile Include="Data\Enum\SkinType.cs" />
    <Compile Include="Data\Enum\StepStatus.cs" />
    <Compile Include="Data\Enum\TipPlacement.cs" />
-    <Compile Include="Data\Enum\ToolTipIcon.cs" />
    <Compile Include="Data\Gif\GifFrameDimension.cs" />
    <Compile Include="Data\Gif\GifImageInfo.cs" />
    <Compile Include="Data\Gif\GifPropertyItem.cs" />
    <Compile Include="Data\Gif\GifPropertyItemInternal.cs" />
    <Compile Include="Data\Gif\GPStream.cs" />
-    <Compile Include="Data\Icon.cs" />
    <Compile Include="Data\MessageBoxInfo.cs" />
    <Compile Include="Data\ResourceToken.cs" />
    <Compile Include="Data\SystemVersionInfo.cs" />
@@ -12,7 +12,7 @@ namespace HandyControl.Interactivity

        public void Execute(object parameter)
        {
-            if (Application.Current.MainWindow != null)
+            if (Application.Current.MainWindow != null && Application.Current.MainWindow.Visibility != Visibility.Visible)
            {
                Application.Current.MainWindow.Show();
                var hwndSource = (HwndSource)PresentationSource.FromDependencyObject(Application.Current.MainWindow);
@@ -1,8 +1,10 @@
-using System.Security;
+using System.Diagnostics.CodeAnalysis;
+using System.Security;
 using System.Security.Permissions;

 namespace HandyControl.Tools
 {
+    [SuppressMessage("ReSharper", "InconsistentNaming")]
    internal class SecurityHelper
    {
        private static UIPermission _allWindowsUIPermission;
@@ -105,11 +105,11 @@ namespace HandyControl.Tools.Interop

                if (_handleCount > _threshHold)
                {
-                    _threshHold = _handleCount + ((_handleCount * _deltaPercent) / 100);
+                    _threshHold = _handleCount + _handleCount * _deltaPercent / 100;
                    return true;
                }

-                var oldThreshHold = (100 * _threshHold) / (100 + _deltaPercent);
+                var oldThreshHold = 100 * _threshHold / (100 + _deltaPercent);
                if (oldThreshHold >= _initialThreshHold && _handleCount < (int)(oldThreshHold * .9F))
                {
                    _threshHold = oldThreshHold;
@@ -1,8 +1,10 @@
-using System.Runtime.InteropServices;
+using System.Diagnostics.CodeAnalysis;
+using System.Runtime.InteropServices;

 namespace HandyControl.Tools.Interop
 {
    [StructLayout(LayoutKind.Sequential)]
+    [SuppressMessage("ReSharper", "InconsistentNaming")]
    internal class ICONINFO
    {
        public bool fIcon = false;
@@ -15,14 +15,14 @@ namespace HandyControl.Tools.Interop
        public int uCallbackMessage;
        public IntPtr hIcon;
        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 128)]
-        public string szTip;
-        public int dwState = 0;
-        public int dwStateMask = 0;
+        public string szTip = string.Empty;
+        public int dwState = 0x01;
+        public int dwStateMask = 0x01;
        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
-        public string szInfo;
+        public string szInfo = string.Empty;
        public int uTimeoutOrVersion;
        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 64)]
-        public string szInfoTitle;
+        public string szInfoTitle = string.Empty;
        public int dwInfoFlags;
    }
 }
@@ -165,7 +165,9 @@ namespace HandyControl.Tools.Interop
            IntPtr hInstance,
            IntPtr lpParam);

-        [DllImport(ExternDll.User32, CharSet = CharSet.Auto, SetLastError = true)]
+        [SecurityCritical]
+        [SuppressUnmanagedCodeSecurity]
+        [DllImport(ExternDll.User32, CharSet = CharSet.Unicode, SetLastError = true, BestFitMapping = false)]
        public static extern short RegisterClass(WNDCLASS wc);

        [DllImport(ExternDll.User32, CharSet = CharSet.Auto)]
@@ -4,53 +4,73 @@
             xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
             xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
             xmlns:interactivity="clr-namespace:HandyControl.Interactivity;assembly=HandyControl"
+             xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+             xmlns:command="http://www.galasoft.ch/mvvmlight"
             DataContext="{Binding NotifyIconDemo,Source={StaticResource Locator}}"
             Background="{DynamicResource RegionBrush}">
-    <controls:SimplePanel>
-        <StackPanel Orientation="Horizontal" Margin="32" VerticalAlignment="Center">
-            <GroupBox Header="ContextMenu" Padding="10">
-                <StackPanel>
-                    <GroupBox controls:TitleElement.TitleAlignment="Left" Style="{StaticResource GroupBoxOriginal}" Header="{x:Static langs:Lang.Visibility}">
-                        <ToggleButton IsChecked="{Binding ContextMenuIsShow}" Style="{StaticResource ToggleButtonSwitch}"/>
-                    </GroupBox>
-                    <TextBlock Foreground="{DynamicResource InfoBrush}" Visibility="{Binding ContextMenuIsShow,Converter={StaticResource Boolean2VisibilityConverter}}" Text="{x:Static langs:Lang.Try2CloseApp}" Margin="0,6,0,0"/>
-                    <GroupBox Margin="0,10,0,0" controls:TitleElement.TitleAlignment="Left" Style="{StaticResource GroupBoxOriginal}" Header="{x:Static langs:Lang.Blink}">
-                        <ToggleButton IsChecked="{Binding ContextMenuIsBlink}" IsEnabled="{Binding ContextMenuIsShow}" Style="{StaticResource ToggleButtonSwitch}"/>
-                    </GroupBox>
-                </StackPanel>
-            </GroupBox>
-            <GroupBox Header="ContextContent" Margin="16,0,0,0" Padding="10">
-                <StackPanel>
-                    <GroupBox controls:TitleElement.TitleAlignment="Left" Style="{StaticResource GroupBoxOriginal}" Header="{x:Static langs:Lang.Visibility}">
-                        <ToggleButton IsChecked="{Binding ContextContentIsShow}" Style="{StaticResource ToggleButtonSwitch}"/>
-                    </GroupBox>
-                    <TextBlock Foreground="{DynamicResource InfoBrush}" Visibility="{Binding ContextContentIsShow,Converter={StaticResource Boolean2VisibilityConverter}}" Text="{x:Static langs:Lang.Try2CloseApp}" Margin="0,6,0,0"/>
-                    <GroupBox Margin="0,10,0,0" controls:TitleElement.TitleAlignment="Left" Style="{StaticResource GroupBoxOriginal}" Header="{x:Static langs:Lang.Blink}">
-                        <ToggleButton IsChecked="{Binding ContextContentIsBlink}" IsEnabled="{Binding ContextContentIsShow}" Style="{StaticResource ToggleButtonSwitch}"/>
-                    </GroupBox>
-                </StackPanel>
-            </GroupBox>
-        </StackPanel>
-        <controls:NotifyIcon Text="HandyControl" IsBlink="{Binding ContextMenuIsBlink}" Visibility="{Binding ContextMenuIsShow,Converter={StaticResource Boolean2VisibilityConverter}}">
-            <controls:NotifyIcon.ContextMenu>
-                <ContextMenu>
-                    <MenuItem Command="interactivity:ControlCommands.PushMainWindow2Top" Header="{x:Static langs:Lang.OpenPanel}"/>
-                    <MenuItem Command="interactivity:ControlCommands.ShutdownApp" Header="{x:Static langs:Lang.Exit}"/>
-                </ContextMenu>
-            </controls:NotifyIcon.ContextMenu>
-        </controls:NotifyIcon>
-        <controls:NotifyIcon Text="HandyControl" IsBlink="{Binding ContextContentIsBlink}" Visibility="{Binding ContextContentIsShow,Converter={StaticResource Boolean2VisibilityConverter}}" Icon="/HandyControlDemo;component/Resources/Img/icon-white.ico">
-            <controls:NotifyIcon.ContextContent>
-                <Border CornerRadius="4" Margin="10" Background="White" Effect="{StaticResource EffectShadow2}">
-                    <StackPanel VerticalAlignment="Center" Margin="16">
-                        <Path Width="100" Height="100" Fill="#f06632" Data="{StaticResource LogoGeometry}"/>
-                        <StackPanel Margin="0,16,0,0" HorizontalAlignment="Center" Orientation="Horizontal">
-                            <Button Command="interactivity:ControlCommands.PushMainWindow2Top" MinWidth="100" Content="{x:Static langs:Lang.OpenPanel}"/>
-                            <Button Command="interactivity:ControlCommands.ShutdownApp" Margin="16,0,0,0" MinWidth="100" Style="{StaticResource ButtonPrimary}" Content="{x:Static langs:Lang.Exit}"/>
-                        </StackPanel>
+    <controls:TransitioningContentControl>
+        <controls:SimplePanel Margin="32">
+            <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
+                <GroupBox Header="ContextMenu" Padding="10">
+                    <StackPanel>
+                        <GroupBox controls:TitleElement.TitleAlignment="Left" Style="{StaticResource GroupBoxOriginal}" Header="{x:Static langs:Lang.Visibility}">
+                            <ToggleButton IsChecked="{Binding ContextMenuIsShow}" Style="{StaticResource ToggleButtonSwitch}"/>
+                        </GroupBox>
+                        <TextBlock Foreground="{DynamicResource InfoBrush}" Visibility="{Binding ContextMenuIsShow,Converter={StaticResource Boolean2VisibilityConverter}}" Text="{x:Static langs:Lang.Try2CloseApp}" Margin="0,6,0,0"/>
+                        <GroupBox Margin="0,10,0,0" controls:TitleElement.TitleAlignment="Left" Style="{StaticResource GroupBoxOriginal}" Header="{x:Static langs:Lang.Blink}">
+                            <ToggleButton IsChecked="{Binding ContextMenuIsBlink}" IsEnabled="{Binding ContextMenuIsShow}" Style="{StaticResource ToggleButtonSwitch}"/>
+                        </GroupBox>
                    </StackPanel>
-                </Border>
-            </controls:NotifyIcon.ContextContent>
-        </controls:NotifyIcon>
-    </controls:SimplePanel>
+                </GroupBox>
+                <GroupBox Header="ContextContent" Margin="16,0,0,0" Padding="10">
+                    <StackPanel>
+                        <GroupBox controls:TitleElement.TitleAlignment="Left" Style="{StaticResource GroupBoxOriginal}" Header="{x:Static langs:Lang.Visibility}">
+                            <ToggleButton IsChecked="{Binding ContextContentIsShow}" Style="{StaticResource ToggleButtonSwitch}"/>
+                        </GroupBox>
+                        <TextBlock Foreground="{DynamicResource InfoBrush}" Visibility="{Binding ContextContentIsShow,Converter={StaticResource Boolean2VisibilityConverter}}" Text="{x:Static langs:Lang.Try2CloseApp}" Margin="0,6,0,0"/>
+                        <GroupBox Margin="0,10,0,0" controls:TitleElement.TitleAlignment="Left" Style="{StaticResource GroupBoxOriginal}" Header="{x:Static langs:Lang.Blink}">
+                            <ToggleButton IsChecked="{Binding ContextContentIsBlink}" IsEnabled="{Binding ContextContentIsShow}" Style="{StaticResource ToggleButtonSwitch}"/>
+                        </GroupBox>
+                    </StackPanel>
+                </GroupBox>
+            </StackPanel>
+            <controls:NotifyIcon Text="HandyControl" IsBlink="{Binding ContextMenuIsBlink}" Visibility="{Binding ContextMenuIsShow,Converter={StaticResource Boolean2VisibilityConverter}}">
+                <controls:NotifyIcon.ContextMenu>
+                    <ContextMenu>
+                        <MenuItem Command="interactivity:ControlCommands.PushMainWindow2Top" Header="{x:Static langs:Lang.OpenPanel}"/>
+                        <MenuItem Command="interactivity:ControlCommands.ShutdownApp" Header="{x:Static langs:Lang.Exit}"/>
+                    </ContextMenu>
+                </controls:NotifyIcon.ContextMenu>
+                <i:Interaction.Triggers>
+                    <i:EventTrigger EventName="Click">
+                        <command:EventToCommand Command="interactivity:ControlCommands.PushMainWindow2Top"/>
+                    </i:EventTrigger>
+                    <i:EventTrigger EventName="MouseDoubleClick">
+                        <command:EventToCommand Command="{Binding MouseCmd}" CommandParameter="MouseDoubleClick"/>
+                    </i:EventTrigger>
+                </i:Interaction.Triggers>
+            </controls:NotifyIcon>
+            <controls:NotifyIcon x:Name="NotifyIconContextContent" Text="HandyControl" IsBlink="{Binding ContextContentIsBlink}" Visibility="{Binding ContextContentIsShow,Converter={StaticResource Boolean2VisibilityConverter}}" Icon="/HandyControlDemo;component/Resources/Img/icon-white.ico">
+                <controls:NotifyIcon.ContextContent>
+                    <Border CornerRadius="4" Margin="10" Background="White" Effect="{StaticResource EffectShadow2}">
+                        <StackPanel VerticalAlignment="Center" Margin="16">
+                            <Path Width="100" Height="100" Fill="#f06632" Data="{StaticResource LogoGeometry}"/>
+                            <StackPanel Margin="0,16,0,0" HorizontalAlignment="Center" Orientation="Horizontal">
+                                <Button Click="ButtonPush_OnClick"  Command="interactivity:ControlCommands.PushMainWindow2Top" MinWidth="100" Content="{x:Static langs:Lang.OpenPanel}"/>
+                                <Button Command="interactivity:ControlCommands.ShutdownApp" Margin="16,0,0,0" MinWidth="100" Style="{StaticResource ButtonPrimary}" Content="{x:Static langs:Lang.Exit}"/>
+                            </StackPanel>
+                        </StackPanel>
+                    </Border>
+                </controls:NotifyIcon.ContextContent>
+                <i:Interaction.Triggers>
+                    <i:EventTrigger EventName="Click">
+                        <command:EventToCommand Command="interactivity:ControlCommands.PushMainWindow2Top"/>
+                    </i:EventTrigger>
+                    <i:EventTrigger EventName="MouseDoubleClick">
+                        <command:EventToCommand Command="{Binding MouseCmd}" CommandParameter="MouseDoubleClick"/>
+                    </i:EventTrigger>
+                </i:Interaction.Triggers>
+            </controls:NotifyIcon>
+        </controls:SimplePanel>
+    </controls:TransitioningContentControl>
 </UserControl>
@@ -1,4 +1,6 @@
-namespace HandyControlDemo.UserControl
+using System.Windows;
+
+namespace HandyControlDemo.UserControl
 {
    public partial class NotifyIconDemoCtl
    {
@@ -6,5 +8,7 @@
        {
            InitializeComponent();
        }
+
+        private void ButtonPush_OnClick(object sender, RoutedEventArgs e) => NotifyIconContextContent.CloseContextControl();
    }
 }
@@ -1,4 +1,7 @@
-using GalaSoft.MvvmLight;
+using System;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.CommandWpf;
+using HandyControl.Controls;
 using HandyControlDemo.Data;

 namespace HandyControlDemo.ViewModel
@@ -44,5 +47,8 @@ namespace HandyControlDemo.ViewModel
            get => _contextContentIsBlink;
            set => Set(ref _contextContentIsBlink, value);
        }
+
+        public RelayCommand<object> MouseCmd => new Lazy<RelayCommand<object>>(() =>
+            new RelayCommand<object>(str=> Growl.Info(str.ToString()))).Value;
    }
 }
@@ -9,14 +9,9 @@

 ![qq-group](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/qq-group.png)

-## 捐赠
-如果您觉得HandyControl还不错，那么就以HandyControl的名义，花一顿饭的钱来为慈善事业做一份贡献吧（捐赠留言写：HandyControl），谢谢大家。  
+## Special thanks to

-捐赠链接：
-[中华慈善总会](http://www.chinacharityfederation.org/ConfirmDonation/0.html?zhijie=3)  
-
-也可以扫下面的二维码：  
-![中华慈善总会](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/chinacharityfederation.png)  
+[![JetBrains](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/resharper_logo.svg)](https://www.jetbrains.com/?from=HandyControl)

 ## Usage

@@ -39,6 +34,10 @@ Step 3：enjoy coding

 ## Latest examples

+### NotifyIcon
+
+![NotifyIcon](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/NotifyIcon.png)
+
 ### Dialog

 ![Dialog](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/Dialog.png)
@@ -55,12 +54,12 @@ Step 3：enjoy coding

 ![Gravatar](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/Gravatar.gif)

+## History publication
+
 ### ChatBubble

 ![ChatBubble](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/ChatBubble.png)

-## History publication
-
 ### Transfer

 ![Transfer](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/Transfer.png)
@@ -287,6 +286,14 @@ Step 3：enjoy coding

 ![BorderStyle](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/Border.png)

-# Switching configuration
+## Switching configuration

 ![Switching configuration](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/SwitchConfig.png)
+
+# 捐赠（面向中国）
+如果您觉得HandyControl还不错，并且刚好有些闲钱，那么你可以选择以下两种方式来捐赠：
+
+* [以HandyControl的名义为慈善事业做贡献](http://www.chinacharityfederation.org/ConfirmDonation/0.html?zhijie=3)  
+
+* 为我们购买防脱洗发水  
+![qrcode](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/qrcode.png)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="70px" height="70px" viewBox="0 0 70 70" style="enable-background:new 0 0 70 70;" xml:space="preserve">
+<g>
+	<g>
+		<g>
+			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="22.9451" y1="75.7869" x2="74.7868" y2="20.6415">
+				<stop  offset="1.612903e-002" style="stop-color:#B35BA3"/>
+				<stop  offset="0.4044" style="stop-color:#C41E57"/>
+				<stop  offset="0.4677" style="stop-color:#C41E57"/>
+				<stop  offset="0.6505" style="stop-color:#EB8523"/>
+				<stop  offset="0.9516" style="stop-color:#FEBD11"/>
+			</linearGradient>
+			<polygon style="fill:url(#SVGID_1_);" points="49.8,15.2 36,36.7 58.4,70 70,23.1 			"/>
+			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="17.7187" y1="73.2922" x2="69.5556" y2="18.1519">
+				<stop  offset="1.612903e-002" style="stop-color:#B35BA3"/>
+				<stop  offset="0.4044" style="stop-color:#C41E57"/>
+				<stop  offset="0.4677" style="stop-color:#C41E57"/>
+				<stop  offset="0.7043" style="stop-color:#EB8523"/>
+			</linearGradient>
+			<polygon style="fill:url(#SVGID_2_);" points="51.1,15.7 49,0 18.8,33.6 27.6,42.3 20.8,70 58.4,70 			"/>
+		</g>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="1.8281" y1="53.4275" x2="48.8245" y2="9.2255">
+			<stop  offset="1.612903e-002" style="stop-color:#B35BA3"/>
+			<stop  offset="0.6613" style="stop-color:#C41E57"/>
+		</linearGradient>
+		<polygon style="fill:url(#SVGID_3_);" points="49,0 11.6,0 0,47.1 55.6,47.1 		"/>
+		<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="49.8935" y1="-11.5569" x2="48.8588" y2="24.0352">
+			<stop  offset="0.5" style="stop-color:#C41E57"/>
+			<stop  offset="0.6668" style="stop-color:#D13F48"/>
+			<stop  offset="0.7952" style="stop-color:#D94F39"/>
+			<stop  offset="0.8656" style="stop-color:#DD5433"/>
+		</linearGradient>
+		<polygon style="fill:url(#SVGID_4_);" points="55.3,47.1 51.1,15.7 49,0 41.7,23 		"/>
+	</g>
+	<g>
+		
+			<rect x="13.4" y="13.5" transform="matrix(-1 2.577289e-003 -2.577289e-003 -1 70.0288 70.081)" style="fill:#000000;" width="43.2" height="43.2"/>
+		
+			<rect x="17.6" y="48.6" transform="matrix(1 -2.577289e-003 2.577289e-003 1 -0.1287 6.634109e-002)" style="fill:#FFFFFF;" width="16.2" height="2.7"/>
+		<path style="fill:#FFFFFF;" d="M17.4,19.1l8.2,0c2.3,0,4,0.6,5.2,1.8c1,1,1.5,2.4,1.5,4.1l0,0.1c0,1.5-0.3,2.6-1.1,3.5
+			c-0.7,0.9-1.6,1.6-2.8,2l4.4,6.4l-4.6,0l-3.7-5.5l-3.3,0l0,5.5l-3.9,0L17.4,19.1z M25.3,27.8c1,0,1.7-0.2,2.2-0.7
+			c0.5-0.5,0.8-1.1,0.8-1.8l0-0.1c0-0.9-0.3-1.5-0.8-1.9c-0.5-0.4-1.3-0.6-2.3-0.6l-3.9,0l0,5.1L25.3,27.8z"/>
+		<path style="fill:#FFFFFF;" d="M36,33.2l-1.9,0l0-3.3l2.5,0l0.6-3.8l-2.3,0l0-3.3l2.8,0l0.6-3.7l3.4,0l-0.6,3.7l3.7,0l0.6-3.7
+			l3.4,0l-0.6,3.7l1.9,0l0,3.3l-2.5,0L47,29.9l2.3,0l0,3.3l-2.8,0L45.8,37l-3.4,0l0.7-3.8l-3.7,0L38.7,37l-3.4,0L36,33.2z
+			 M43.7,29.9l0.6-3.8l-3.7,0L40,29.9L43.7,29.9z"/>
+	</g>
+</g>
+</svg>