From ae3275e9ef71c44b77dc0e2ad9cade3cd0181e99 Mon Sep 17 00:00:00 2001 From: cyf Date: Mon, 1 Jun 2026 01:57:49 +0000 Subject: [PATCH] SVN r1192 SVN-Revision: r1192 --- 插件库/Lskj.Main/FrmLogin.cs | 15 ++++++ 插件库/Lskj.Main/FrmMain.cs | 57 +++++++++++++++++++++- 插件库/Lskj.Main/Program.cs | 37 +------------- 插件库/Lskj.Main/Resources/密码不显示.png | Bin 0 -> 2076 bytes 插件库/Lskj.Main/Resources/密码显示.png | Bin 0 -> 2412 bytes 5 files changed, 73 insertions(+), 36 deletions(-) create mode 100644 插件库/Lskj.Main/Resources/密码不显示.png create mode 100644 插件库/Lskj.Main/Resources/密码显示.png diff --git a/插件库/Lskj.Main/FrmLogin.cs b/插件库/Lskj.Main/FrmLogin.cs index 845cb68..1104b26 100644 --- a/插件库/Lskj.Main/FrmLogin.cs +++ b/插件库/Lskj.Main/FrmLogin.cs @@ -1180,6 +1180,21 @@ namespace Lskj.Main this.SetLanguage(); this.SetLedgers(); this.SetUsers(); + + //弹出提示框 + if (SystemInfo.Instance.LoginAnnouncement) + { + if (BaseImpl.HasExistsTable("p_ErpProUpdateInfo")&& BaseImpl.HasExistsColumn("p_ErpProUpdateInfo", "AnnouncementDisplay")) + { + bool result = "1".Equals(BaseImpl.GetResult("select 1 from p_ErpProUpdateInfo where AnnouncementDisplay=1 order by updateDate desc") + ""); + if (result) + { + FrmAnnouncement frmAnnouncement = new FrmAnnouncement(); + frmAnnouncement.ShowDialog(); + } + } + } + } catch (Exception ex) { diff --git a/插件库/Lskj.Main/FrmMain.cs b/插件库/Lskj.Main/FrmMain.cs index 9ab6d0d..d05e1e5 100644 --- a/插件库/Lskj.Main/FrmMain.cs +++ b/插件库/Lskj.Main/FrmMain.cs @@ -447,6 +447,12 @@ namespace Lskj.Main { try { + if (this.WindowState == FormWindowState.Normal) + { + EnsureFormInCurrentScreen(); + //Screen screen = Screen.FromControl(this); + //this.MaximumSize = screen.WorkingArea.Size; + } this.WindowState = this.WindowState == FormWindowState.Normal ? FormWindowState.Maximized : FormWindowState.Normal; if (this.WindowState == FormWindowState.Maximized) { @@ -585,6 +591,10 @@ namespace Lskj.Main base.OnMouseUp(e); _isMouseDown = false; //this.Focus(); + if (this.WindowState == FormWindowState.Normal) + { + EnsureFormInCurrentScreen(); + } this.mainPanelControlEx.pic_search.Focus();//点击界面失去焦点 } catch (Exception ex) @@ -677,4 +687,49 @@ namespace Lskj.Main public uint dwActiveProcessorMask; public uint dwNumberOfProcessors; public uint dwProcessorType; - public uint dwAllocationGra \ No newline at end of file + public uint dwAllocationGranularity; + public uint dwProcessorLevel; + public uint dwProcessorRevision; + } + //定义内存的信息结构 + [StructLayout(LayoutKind.Sequential)] + public struct MEMORY_INFO + { + public uint dwLength; + public uint dwMemoryLoad; + public uint dwTotalPhys; + public uint dwAvailPhys; + public uint dwTotalPageFile; + public uint dwAvailPageFile; + public uint dwTotalVirtual; + public uint dwAvailVirtual; + } + //定义系统时间的信息结构 + [StructLayout(LayoutKind.Sequential)] + public struct SYSTEMTIME_INFO + { + public ushort wYear; + public ushort wMonth; + public ushort wDayOfWeek; + public ushort wDay; + public ushort wHour; + public ushort wMinute; + public ushort wSecond; + public ushort wMilliseconds; + } + + + /// + /// 多屏时设置程序大小 + /// + private void EnsureFormInCurrentScreen() + { + if (this.WindowState != FormWindowState.Normal) + { + return; + } + + Screen screen = Screen.FromPoint(System.Windows.Forms.Control.MousePosition); + Rectangle workingArea = screen.WorkingArea; + + \ No newline at end of file diff --git a/插件库/Lskj.Main/Program.cs b/插件库/Lskj.Main/Program.cs index 83950db..8818712 100644 --- a/插件库/Lskj.Main/Program.cs +++ b/插件库/Lskj.Main/Program.cs @@ -38,7 +38,6 @@ namespace Lskj.Main [STAThread] static void Main(string[] args) { - //SetProcessDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2); CefRuntime.Load();//cef浏览器模块设置加载 var mainArgs = new CefMainArgs(args); @@ -62,7 +61,7 @@ namespace Lskj.Main try { // 汉化DevExpress界面 - Thread.CurrentThread.CurrentUICulture = new CultureInfo("zh-CH"); + Thread.CurrentThread.CurrentUICulture = new CultureInfo("zh-CN"); // 设置皮肤 BonusSkins.Register(); SkinManager.EnableFormSkins(); @@ -223,36 +222,4 @@ namespace Lskj.Main } using (var key = Registry.CurrentUser.CreateSubKey(@"Software\Classes\lserp\shell\open\command")) { - key.SetValue("", $"\"{exePath}\" \"%1\""); - } - } - - private static void Unregister() - { - Registry.CurrentUser.DeleteSubKeyTree(@"Software\Classes\lserp", false); - } - #endregion - - //public static Form GetForm() - //{ - // Form X = new CEFdemo.Form1(); - // return X; - //} - public class Messager : IMessageFilter - { - public bool PreFilterMessage(ref Message m) - { - //如果检测到有鼠标或则键盘的消息，则使计数为0..... - if (m.Msg == 0x0200 || m.Msg == 0x0201 || m.Msg == 0x0204 || m.Msg == 0x0207) - { - Manager.isAwaitTime = 0; - } - if (m.Msg == 0x0100 && m.WParam != new IntPtr(0x0000001b) && Lskj.Model.ERPInfo.Instance.IsExecute) - { - return true; - } - return false; - } - } - } -} + key.SetValu \ No newline at end of file diff --git a/插件库/Lskj.Main/Resources/密码不显示.png b/插件库/Lskj.Main/Resources/密码不显示.png new file mode 100644 index 0000000000000000000000000000000000000000..a18a79aab7e8861a9b8cf19624c768dfe09a9103 GIT binary patch literal 2076 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 e21!IgR09CczNIsRkO=z#0000