Merge branch 'master' of http://192.168.0.12:13000/sc/SUNLIGHT_CDKEY

MainWindow.xaml

@@ -5,10 +5,11 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:SUNLIGHT_CDKEY"
         mc:Ignorable="d"
-        Title="MainWindow" Height="400" Width="600">
+        Title="SUNLIGHT_CDKEY" Height="400" Width="600">
     <Grid>
         <TextBlock HorizontalAlignment="Left" Height="40" Margin="20,10,0,0" TextWrapping="Wrap" Text="SN:" VerticalAlignment="Top" Width="170" FontSize="24"/>
-        <TextBox x:Name="sn_id" HorizontalAlignment="Left" Height="40" Margin="170,10,0,0" VerticalAlignment="Top" Width="340" FontSize="24"/>
+        <TextBox x:Name="sn_id" HorizontalAlignment="Left" Height="40" Margin="170,10,0,0" VerticalAlignment="Top" Width="340" FontSize="24" 
+                 PreviewTextInput="AlphanumericValidationTextBox" InputMethod.IsInputMethodEnabled="False"/>
         <TextBlock HorizontalAlignment="Left" Height="40" Margin="20,55,0,0" TextWrapping="Wrap" Text="DURATION:" VerticalAlignment="Top" Width="170" FontSize="24"/>
         <TextBlock HorizontalAlignment="Left" Height="40" Margin="400,55,0,0" TextWrapping="Wrap" Text="MONTHS" VerticalAlignment="Top" Width="170" FontSize="24"/>
         <ComboBox x:Name="DURATION"  HorizontalAlignment="Left" Height="40" Margin="170,55,0,0" VerticalAlignment="Top" Width="220"  DropDownClosed="DURATION_DropDownClosed" FontSize="24">

MainWindow.xaml.cs

@@ -1,8 +1,10 @@
-using System;
+using formula_manage.UserClass;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
+using System.Threading;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
@@ -12,7 +14,6 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
-using SUNLIGHT_CDKEY.UserClass;
 
 namespace SUNLIGHT_CDKEY
 {
@@ -30,6 +31,15 @@ namespace SUNLIGHT_CDKEY
             T_M.Text = DateTime.Now.ToString("MM");
             T_D.Text = DateTime.Now.ToString("dd");
         }
+        private void AlphanumericValidationTextBox(object sender, TextCompositionEventArgs e)
+        {
+            Regex regex = new Regex(@"[^a-eA-E0-9]+$");
+            e.Handled = regex.IsMatch(e.Text.ToUpper());
+        }
+        private void validation_PreviewKeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Space) e.Handled = true;
+        }
 
         private void Tb_KeyFloating_D(object sender, TextCompositionEventArgs e)//输入事件
         {
@@ -105,10 +115,27 @@ namespace SUNLIGHT_CDKEY
 
         private void Button_Click(object sender, RoutedEventArgs e)
         {
-            string a, b;
+            string a;
+            string b, my, mm, md;
 
-            a= sn_id.Text.Substring(0, 6);
-            b=(2255-y).ToString()+(255-m).ToString()+(255-d).ToString();
+            sn_id.Text = sn_id.Text.ToUpper();
+
+            if (sn_id.Text.Length < 6)//id字节长度大于6有效
+            {
+                sn_id.BorderBrush = new SolidColorBrush(System.Windows.Media.Color.FromArgb(255, 255, 0, 0));
+                return;
+            }
+            else 
+            { 
+                sn_id.BorderBrush = new SolidColorBrush(System.Windows.Media.Color.FromArgb(255, 255, 255, 255));
+            }
+
+            a= sn_id.Text.Substring(5, 1)+ sn_id.Text.Substring(0, 1)+ sn_id.Text.Substring(4, 1) + sn_id.Text.Substring(1, 1) + sn_id.Text.Substring(3, 1)+ sn_id.Text.Substring(2, 1);
+       
+            my = Convert.ToString(Convert.ToInt32(2255 - y), 16).ToUpper();
+            mm = Convert.ToString(Convert.ToInt32(255 - m), 16).ToUpper();
+            md = Convert.ToString(Convert.ToInt32(255-d), 16).ToUpper();
+            b=my+mm+md;
 
             cdk.Text = a + b + CRCcheck16.ToCRC16(CRCcheck16.StringToHexByte(b), true);
         }

SUNLIGHT_CDKEY.csproj

@@ -33,6 +33,9 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>sunlight_logo.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -66,7 +69,7 @@
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="UserClass\CRCcheck16.cs" />
+    <Compile Include="CRCcheck16.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -86,5 +89,8 @@
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="sunlight_logo.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>