This commit is contained in:
backuppc
2025-07-11 11:30:52 +09:00
parent ed0db28b1f
commit 4f54a97ace
13 changed files with 1187 additions and 131 deletions

View File

@@ -105,10 +105,12 @@ namespace Project
this.Text = Application.ProductName + " v" + Application.ProductVersion;
Pub.init();
Pub.InitializeWebView2();
setToolbar();
var f = new Dialog.fWarning();
f.TopMost = true;
f.Show();
_SetLang();
if (Pub.setting.FullScreen) this.WindowState = FormWindowState.Maximized;
@@ -137,10 +139,6 @@ namespace Project
//Data Source=K4FASQL.kr.ds.amkor.com,50150;Initial Catalog=EE;Persist Security Info=True;User ID=eeadm;Password=uJnU8a8q&DJ+ug-D;Encrypt=False;TrustServerCertificate=True
Pub.barcode = new Device.Barcode();
if (!Pub.setting.Barcode.isEmpty()) Pub.barcode.PortName = Pub.setting.Barcode;
Pub.barcode.ReceiveData += barcode_ReceiveData;
@@ -167,8 +165,22 @@ namespace Project
webok = false;
}
var wat = new System.Diagnostics.Stopwatch();
wat.Restart();
while(true)
{
if (Pub.InitWebView != 0) break;
if (wat.ElapsedMilliseconds > 5000) break;
System.Threading.Thread.Sleep(1000);
Application.DoEvents();
}
f.Dispose();
Func_Login();
///즐겨찾기 목록 갱신
Update_FavoriteSite();
@@ -204,18 +216,19 @@ namespace Project
void Func_Login()
{
#if WEB
using (var f = new Dialog.fLogin_WB())
if (f.ShowDialog() != System.Windows.Forms.DialogResult.OK)
Application.ExitThread();
#else
//Pub.InitWebView = 2;
if (Pub.InitWebView == 1)
{
using (var f = new Dialog.fLogin_WB())
if (f.ShowDialog() != System.Windows.Forms.DialogResult.OK)
Application.ExitThread();
}
else
{
using (var f = new Dialog.fLogin())
if (f.ShowDialog() != System.Windows.Forms.DialogResult.OK)
Application.ExitThread();
#endif
}
this.mn_purchase.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_purchase);