C3204
2026-01-05 6c9631852757c8615825142bb4ff2658e645eb86
修复登录显示Bug。
已修改3个文件
129 ■■■■ 文件已修改
LB_SmartVision/Program.cs 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
LB_SmartVisionLoginUI/LB_SmartVisionLoginUI.csproj 73 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
LB_SmartVisionLoginUI/MainWindow.xaml 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
LB_SmartVision/Program.cs
@@ -24,21 +24,26 @@
                    System.Threading.Mutex mutex = new System.Threading.Mutex(true, System.Windows.Forms.Application.ProductName, out ret);
                    if (ret)
                    {
                        ////登录验证权限
                        MainWindow.InstanceLoginandConfirmation().ShowDialog();
                        if (!MainWindow.InstanceLoginandConfirmation().isQuit && MainWindow.InstanceLoginandConfirmation().correctUser)
                        {
                            MainWindow.InstanceLoginandConfirmation().closeLoginFrm();
                            Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
                            System.Windows.Forms.Application.EnableVisualStyles();
                            System.Windows.Forms.Application.SetCompatibleTextRenderingDefault(false);
                            System.Windows.Forms.Application.SetUnhandledExceptionMode(UnhandledExceptionMode.CatchException);
                            System.Windows.Forms.Application.ThreadException += (sender, e) => HandleException(e.Exception);
                            AppDomain.CurrentDomain.UnhandledException += (sender, e) => HandleException(e.ExceptionObject as Exception);
                            // To customize application configuration such as set high DPI settings or default font,
                            // see https://aka.ms/applicationconfiguration.
                            System.Windows.Forms.Application.Run(new VisionForm());
                        }
                        //   Main   为你程序的主窗体,如果是控制台程序不用这句
                        else
                        {
                            MainWindow.InstanceLoginandConfirmation().closeLoginFrm();
                        }
                        ////   Main   为你程序的主窗体,如果是控制台程序不用这句
                        Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
                        System.Windows.Forms.Application.EnableVisualStyles();
                        System.Windows.Forms.Application.SetCompatibleTextRenderingDefault(false);
                        System.Windows.Forms.Application.SetUnhandledExceptionMode(UnhandledExceptionMode.CatchException);
                        System.Windows.Forms.Application.ThreadException += (sender, e) => HandleException(e.Exception);
                        AppDomain.CurrentDomain.UnhandledException += (sender, e) => HandleException(e.ExceptionObject as Exception);
                        //// To customize application configuration such as set high DPI settings or default font,
                        //// see https://aka.ms/applicationconfiguration.
                        System.Windows.Forms.Application.Run(new VisionForm());
                        mutex.ReleaseMutex();
                    }
                    else
LB_SmartVisionLoginUI/LB_SmartVisionLoginUI.csproj
@@ -10,7 +10,80 @@
  </PropertyGroup>
  <ItemGroup>
    <None Remove="favicon.ico" />
    <None Remove="images\01.JPG" />
    <None Remove="images\02.png" />
    <None Remove="images\03.png" />
    <None Remove="images\04.png" />
    <None Remove="images\05.png" />
    <None Remove="images\06.png" />
    <None Remove="images\07.png" />
    <None Remove="images\favicon.ico" />
    <None Remove="images\lanbao.jpg" />
    <None Remove="images\logo.ico" />
    <None Remove="images\logo_h.png" />
    <None Remove="images\键盘.ico" />
    <None Remove="lanbao.jpg" />
    <None Remove="logo.ico" />
    <None Remove="logo_h.png" />
  </ItemGroup>
  <ItemGroup>
    <Resource Include="favicon.ico">
      <CopyToOutputDirectory></CopyToOutputDirectory>
    </Resource>
    <Resource Include="images\01.JPG">
      <CopyToOutputDirectory></CopyToOutputDirectory>
    </Resource>
    <Resource Include="images\02.png">
      <CopyToOutputDirectory></CopyToOutputDirectory>
    </Resource>
    <Resource Include="images\03.png">
      <CopyToOutputDirectory></CopyToOutputDirectory>
    </Resource>
    <Resource Include="images\04.png">
      <CopyToOutputDirectory></CopyToOutputDirectory>
    </Resource>
    <Resource Include="images\05.png">
      <CopyToOutputDirectory></CopyToOutputDirectory>
    </Resource>
    <Resource Include="images\06.png">
      <CopyToOutputDirectory></CopyToOutputDirectory>
    </Resource>
    <Resource Include="images\07.png">
      <CopyToOutputDirectory></CopyToOutputDirectory>
    </Resource>
    <Resource Include="images\favicon.ico">
      <CopyToOutputDirectory></CopyToOutputDirectory>
    </Resource>
    <Resource Include="images\lanbao.jpg">
      <CopyToOutputDirectory></CopyToOutputDirectory>
    </Resource>
    <Resource Include="images\logo.ico">
      <CopyToOutputDirectory></CopyToOutputDirectory>
    </Resource>
    <Resource Include="images\logo_h.png">
      <CopyToOutputDirectory></CopyToOutputDirectory>
    </Resource>
    <Resource Include="images\键盘.ico">
      <CopyToOutputDirectory></CopyToOutputDirectory>
    </Resource>
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\LB_SmartVisionCommon\LB_SmartVisionCommon.csproj" />
  </ItemGroup>
  <ItemGroup>
    <Resource Include="lanbao.jpg">
      <CopyToOutputDirectory></CopyToOutputDirectory>
    </Resource>
    <Resource Include="logo.ico">
      <CopyToOutputDirectory></CopyToOutputDirectory>
    </Resource>
    <Resource Include="logo_h.png">
      <CopyToOutputDirectory></CopyToOutputDirectory>
    </Resource>
  </ItemGroup>
</Project>
LB_SmartVisionLoginUI/MainWindow.xaml
@@ -13,36 +13,25 @@
    <Grid x:Name="test" Width="800" Height="460" Opacity="1.0">
        <Grid.Background>
            <ImageBrush ImageSource="./images/lanbao.jpg"
                   Stretch="UniformToFill"/>
            <ImageBrush ImageSource="lanbao.jpg"/>
        </Grid.Background>
        <!--<Grid.Background>
            <ImageBrush ImageSource="/lanbao.jpg"
                   Stretch="UniformToFill"/>
        </Grid.Background>-->
        <!--标题-->
        <Border BorderBrush="LightBlue" BorderThickness="3" Height="60" VerticalAlignment="Top" CornerRadius="30" Margin="116,2,102,0" Background="#72F5DEB3">
            <Label x:Name="Lbl_Title" BorderBrush="Red"  Background="Transparent" Content="轮胎外观视觉检测系统" HorizontalAlignment="Center" Foreground="Black" FontFamily="楷体" FontSize="36" Margin="31,2,91,-2" Width="454"></Label>
        </Border>
        <!--关闭系统-->
        <Image Source="./images/05.png" Height="30" MouseDown="test_Close" Margin="644,15,116,415" ToolTip="关闭系统" />
        <Image Source="/05.png" Height="30" MouseDown="test_Close" Margin="644,15,116,415" ToolTip="关闭系统" />
        <!--最小化系统-->
        <Image Source="./images/06.png" Height="30" Margin="603,15,157,415" MouseDown="test_Min" ToolTip="最小化"/>
        <Image Source="/06.png" Height="30" Margin="603,15,157,415" MouseDown="test_Min" ToolTip="最小化"/>
        <Border BorderBrush="LightBlue" Width="700" Height="325" Background="Transparent" BorderThickness="3" CornerRadius="80" Padding="13" >
            <Border Width="655" BorderThickness="3" CornerRadius="80" BorderBrush="LightBlue"  Padding="23" >
                <!--<Border.Background>
                    <ImageBrush ImageSource="./images/lanbao.jpg" Stretch="UniformToFill"/>
                </Border.Background>-->
                <!--<Image Height="161" Width="162" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="-5,40,0,0" RenderTransformOrigin="0.5,0.5" Stretch="Fill" Source="./images/logo.ico"/>-->
                <!--<Image Source="/images/logo_h.png" Height="161" Width="162" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="-5,40,0,0" RenderTransformOrigin="0.5,0.5" Stretch="Fill" Visibility="Visible" ScrollViewer.HorizontalScrollBarVisibility="Auto" StretchDirection="DownOnly">-->
                    <!--<Image.RenderTransform>
                        <TransformGroup>
                            <ScaleTransform/>
                            <SkewTransform AngleX="0.149"/>
                            <RotateTransform/>
                            <TranslateTransform X="-0.469"/>
                        </TransformGroup>
                    </Image.RenderTransform>
                </Image>-->
            </Border>
        </Border>
@@ -56,9 +45,9 @@
                </TransformGroup>
            </Border.RenderTransform>
            <Button x:Name="Btn_KeyBoard"  Margin="283,67,-16,67" Content="" FontFamily="楷体" FontSize="36" Foreground="Black" Click="Btn_KeyBoard_Click" Visibility="Hidden" >
                <Button.Background>
                    <ImageBrush ImageSource="images/键盘.ico"/>
                </Button.Background>
                <!--<Button.Background>
                    --><!--<ImageBrush ImageSource="images/键盘.ico"/>--><!--
                </Button.Background>-->
            </Button>
        </Border>
        <!--用户密码标签加文本框-->