From a9cbce35e0e6ea595d047d53d0acd2b15f2c548c Mon Sep 17 00:00:00 2001
From: cloudflight <cloudflight@126.com>
Date: 星期六, 23 十一月 2024 14:14:44 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
Desktop/HStation.Desktop.Xhs.Core/Program.cs | 34 +++++++++++++++++++---------------
1 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/Desktop/HStation.Desktop.Xhs.Core/Program.cs b/Desktop/HStation.Desktop.Xhs.Core/Program.cs
index 01a6433..7c75e0d 100644
--- a/Desktop/HStation.Desktop.Xhs.Core/Program.cs
+++ b/Desktop/HStation.Desktop.Xhs.Core/Program.cs
@@ -10,7 +10,7 @@
/// The main entry point for the application.
/// </summary>
[STAThread]
- static void Main()
+ private static void Main()
{
using (var mutex = new System.Threading.Mutex(true, Application.ProductName, out bool createNew))
{
@@ -39,31 +39,38 @@
Application.SetCompatibleTextRenderingDefault(false);
//字体
- // var font = new System.Drawing.Font("微软雅黑", 10);
- // DevExpress.XtraEditors.WindowsFormsSettings.DefaultFont = font;
- // DevExpress.XtraEditors.WindowsFormsSettings.DefaultMenuFont = font;
- // DevExpress.Utils.AppearanceObject.DefaultFont = font;
+ var font = new System.Drawing.Font("微软雅黑", 10);
+ DevExpress.XtraEditors.WindowsFormsSettings.DefaultFont = font;
+ DevExpress.XtraEditors.WindowsFormsSettings.DefaultMenuFont = font;
+ DevExpress.Utils.AppearanceObject.DefaultFont = font;
//zh-Hans界面翻译
System.Threading.Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo("zh-Hans");
System.Threading.Thread.CurrentThread.CurrentCulture = new System.Globalization.CultureInfo("zh-Hans");
//皮肤
- //DevExpress.LookAndFeel.UserLookAndFeel.Default.SetSkinStyle(SkinStyle.WXICompact);
DevExpress.LookAndFeel.UserLookAndFeel.Default.SetSkinStyle(SkinStyle.WXICompact);
+ //DevExpress.LookAndFeel.UserLookAndFeel.Default.SetSkinStyle(SkinStyle.WXICompact);
// To customize application configuration such as set high DPI settings or default font,
// see https://aka.ms/applicationconfiguration.
ApplicationConfiguration.Initialize();
- if (!LoginHelper.Login())
- {
- return;
- }
+ //if (!LoginHelper.Login())
+ //{
+ // return;
+ //}
- //Yw.FileFolderZipHelper.Zip(@"C:\Users\admin\Desktop\居家办公工作\压缩文件", @"C:\Users\admin\Desktop\居家办公工作\压缩文件.ywrvt");
+ // Yw.FileFolderZipHelper.Zip(@"C:\Users\ZKC\Desktop\循环水用例", @"C:\Users\ZKC\Desktop\循环水用例.ywrvt");
+ //Yw.FileFolderZipHelper.Zip(@"C:\Users\Eventech\Desktop\循环水用例", @"C:\Users\Eventech\Desktop\循环水用例.ywrvt");
+ // Yw.FileFolderZipHelper.Zip(@"C:\Users\admin\Desktop\居家办公工作\循环水用例", @"C:\Users\admin\Desktop\居家办公工作\循环水用例.ywrvt");
+ //Yw.FileFolderZipHelper.Zip(@"C:\Users\admin\Desktop\居家办公工作\简单用例", @"C:\Users\admin\Desktop\居家办公工作\简单用例.ywrvt");
+ //var json = RevitTestHelper.GenerateJson();
+ //var jsonFileName = @"C:\Users\admin\Desktop\居家办公工作\二开压缩文件\hydro.json";
+ //var jsonContent = File.ReadAllText(jsonFileName);
+ //var jsonModel = JsonHelper.Json2Object<HStation.Model.RevitModel>(jsonContent);
//扫描全局DTO映射
TypeAdapterConfig.GlobalSettings.Scan
(
@@ -74,12 +81,10 @@
Assembly.Load("HStation.BLL.Xhs.Core")
);
DbFirstHelper.Initial();
+ Yw.WinFrmUI.GlobalParas.AppIcon = HStation.Desktop.Xhs.Core.Properties.Resources.app;
Application.Run(new MainForm());
}
-
-
}
-
///<summary>
/// 这就是我们要在发生未处理异常时处理的方法，我这是写出错详细信息到文本，如出错后弹出一个漂亮的出错提示窗体，给大家做个参考
@@ -101,6 +106,5 @@
Yw.LogHelper.Error("系统出现未知异常,ERROR:255", ex);
MessageBox.Show($"系统出现未知异常，请重启系统！\r\n{ex.Message}");
}
-
}
}
\ No newline at end of file
--
Gitblit v1.9.3