diff --git a/ArinLog/ArinLog.vbproj b/ArinLog/ArinLog.vbproj index 96a742e..0cbfc7a 100644 --- a/ArinLog/ArinLog.vbproj +++ b/ArinLog/ArinLog.vbproj @@ -13,7 +13,7 @@ ArinLog.Net4 512 Windows - v4.0 + v4.8 true diff --git a/ArinLogin/ArinLogin.vbproj b/ArinLogin/ArinLogin.vbproj index 7bc58ee..e029776 100644 --- a/ArinLogin/ArinLogin.vbproj +++ b/ArinLogin/ArinLogin.vbproj @@ -15,7 +15,7 @@ 3.5 - v4.0 + v4.8 diff --git a/ArinNet/ArinNet.vbproj b/ArinNet/ArinNet.vbproj index 77f1337..08845d2 100644 --- a/ArinNet/ArinNet.vbproj +++ b/ArinNet/ArinNet.vbproj @@ -15,7 +15,7 @@ 3.5 - v4.0 + v4.8 diff --git a/ArinWarev1/ECO2_2025V1.vbproj b/ArinWarev1/ECO2_2025V1.vbproj index 52e5e2c..8085af6 100644 --- a/ArinWarev1/ECO2_2025V1.vbproj +++ b/ArinWarev1/ECO2_2025V1.vbproj @@ -29,7 +29,7 @@ 3.5 My Project\app.manifest 002.ico - v4.0 + v4.8 ftp://tindevil.com/www/mynetapp/t4/ true @@ -51,6 +51,8 @@ 1.0.0.%2a false true + + true @@ -133,6 +135,15 @@ + + ..\packages\Microsoft.Web.WebView2.1.0.3537.50\lib\net462\Microsoft.Web.WebView2.Core.dll + + + ..\packages\Microsoft.Web.WebView2.1.0.3537.50\lib\net462\Microsoft.Web.WebView2.WinForms.dll + + + ..\packages\Microsoft.Web.WebView2.1.0.3537.50\lib\net462\Microsoft.Web.WebView2.Wpf.dll + False ..\lib\Owin.dll @@ -197,6 +208,12 @@ Form + + Frm_WebManual.vb + + + Form + fSelectWeatherGroup.vb @@ -524,6 +541,9 @@ frm_batch.vb + + Frm_WebManual.vb + Frm_Work.vb Designer @@ -729,6 +749,7 @@ + @@ -886,6 +907,13 @@ + + + + 이 프로젝트는 이 컴퓨터에 없는 NuGet 패키지를 참조합니다. 해당 패키지를 다운로드하려면 NuGet 패키지 복원을 사용하십시오. 자세한 내용은 http://go.microsoft.com/fwlink/?LinkID=322105를 참조하십시오. 누락된 파일은 {0}입니다. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/ArinWarev1/Forms_Basic/Frm_WebManual.vb b/ArinWarev1/Forms_Basic/Frm_WebManual.vb new file mode 100644 index 0000000..6a3414c --- /dev/null +++ b/ArinWarev1/Forms_Basic/Frm_WebManual.vb @@ -0,0 +1,29 @@ +Public Class Frm_WebManual + + Public Sub Navigate(url As String) + Try + If WebView21 IsNot Nothing AndAlso WebView21.CoreWebView2 IsNot Nothing Then + WebView21.CoreWebView2.Navigate(url) + End If + Catch ex As Exception + MessageBox.Show("웹페이지 이동 중 오류가 발생했습니다: " & ex.Message, + "오류", MessageBoxButtons.OK, MessageBoxIcon.Error) + End Try + End Sub + + + Private Async Sub Frm_WebManual_Load(sender As Object, e As EventArgs) Handles MyBase.Load + Try + ' WebView2 초기화 + Await WebView21.EnsureCoreWebView2Async(Nothing) + + ' 로컬 웹서버 페이지 로드 + WebView21.CoreWebView2.Navigate("http://localhost:58123/") + + Catch ex As Exception + MessageBox.Show("웹페이지 로드 중 오류가 발생했습니다: " & ex.Message, _ + "오류", MessageBoxButtons.OK, MessageBoxIcon.Error) + End Try + End Sub + +End Class \ No newline at end of file diff --git a/ArinWarev1/MdiMain.Designer.vb b/ArinWarev1/MdiMain.Designer.vb index 38710eb..6e5e89b 100644 --- a/ArinWarev1/MdiMain.Designer.vb +++ b/ArinWarev1/MdiMain.Designer.vb @@ -109,6 +109,7 @@ Partial Class MdiMain Me.비교데이터백업ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.데이터비교ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.순실체적ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ManualToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.StatusStrip1.SuspendLayout() Me.MenuStrip1.SuspendLayout() Me.ContextMenuStrip1.SuspendLayout() @@ -178,7 +179,7 @@ Partial Class MdiMain 'MenuStrip1 ' Me.MenuStrip1.Font = New System.Drawing.Font("돋움", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(129, Byte)) - Me.MenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ReportToolStripMenuItem, Me.건물개요ToolStripMenuItem, Me.환경설정ToolStripMenuItem, Me.bt_계산결과, Me.결과그래프ToolStripMenuItem, Me.정보ToolStripMenuItem1, Me.bt_etc, Me.WindowsMenu, Me.btcustomprofile}) + Me.MenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ReportToolStripMenuItem, Me.건물개요ToolStripMenuItem, Me.환경설정ToolStripMenuItem, Me.bt_계산결과, Me.결과그래프ToolStripMenuItem, Me.정보ToolStripMenuItem1, Me.bt_etc, Me.WindowsMenu, Me.btcustomprofile, Me.ManualToolStripMenuItem}) Me.MenuStrip1.Location = New System.Drawing.Point(0, 0) Me.MenuStrip1.MdiWindowListItem = Me.WindowsMenu Me.MenuStrip1.Name = "MenuStrip1" @@ -696,6 +697,13 @@ Partial Class MdiMain Me.순실체적ToolStripMenuItem.Size = New System.Drawing.Size(170, 22) Me.순실체적ToolStripMenuItem.Text = "3.순실체적" ' + 'ManualToolStripMenuItem + ' + Me.ManualToolStripMenuItem.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right + Me.ManualToolStripMenuItem.Name = "ManualToolStripMenuItem" + Me.ManualToolStripMenuItem.Size = New System.Drawing.Size(59, 20) + Me.ManualToolStripMenuItem.Text = "Manual" + ' 'MdiMain ' Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 12.0!) @@ -821,5 +829,5 @@ Partial Class MdiMain Friend WithEvents BatchUpdateProfileToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents btcustomprofile As System.Windows.Forms.ToolStripMenuItem Friend WithEvents btMacro2 As System.Windows.Forms.ToolStripMenuItem - + Friend WithEvents ManualToolStripMenuItem As ToolStripMenuItem End Class diff --git a/ArinWarev1/MdiMain.resx b/ArinWarev1/MdiMain.resx index 2b9a9b8..a8fcc77 100644 --- a/ArinWarev1/MdiMain.resx +++ b/ArinWarev1/MdiMain.resx @@ -127,31 +127,6 @@ 235, 17 - - - R0lGODlhEAAQAIQAAJXD9Iasxm6MqnSn2lZtjVaRyEpXbYu767TX/2KZztvr/4Gy5KrT/3ut32+gzlFh - e+r0/0RNX9/u/9Ln+8Xg//n8/4e36CkxQz9GVkSCvKjL35/N/Je91K7T5bDS4////yH/C05FVFNDQVBF - Mi4wAwEBAAAh+QQAAAAAACwAAAAAEAAQAAAIuQA/CBxIsKDACRwScggQwIGAhwIICBDYQcEEgwg+bNjw - QKCHCQgkQBgpQcKBCg0AEBCoAaRIkhIsVBigUiAHCgwkKNjJU8GAAx0/3NwIAMABCwsaDHCwIGgAChuK - HjiQdMDSAQYEPpWKtKqDBA6yfgiAwGhXpUsTJIgg0AGCo0nRfi1QgO0HAQyQNpCrtkAGDAIFbKi69GsC - un8FEohqdEFavxkyXAhMoPKDBwYMRIiAAcOFoAZDCwwIADs= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAIcSURBVDhPjVPJqhpBFO1VFvmAt0g+Iav3E9nlM7LM - ZyS7rLoc2wFbbGi7bRBxJYojIk6o+BTFCQVHTKsIL1HfDaeIIv0IScGB4tY9Q93qFohIsCKbzX6LxWIz - WZZfAOxRs/YBrwqRSORBVdVfZFmoKYryztp/7ziSZfkiyzJFo1F6enqiy+VC5/OZWq0Wr+EMPei9JuIC - qqo+37uNx2PSdZ0ajQaHpmm8dr/+cATBMAy/YRjUbre5I1AsFikej1MwGOTAHjWkOZ1O1Gw2CRyv16sI - uq6fut0uVatVqtVq3BHu1nVNVKlUKJPJUCqVIkmSToKmaebhcKDlckmDwYCGwyFls1nq9Xq3RNjncjnq - dDqUSCQ46vU6ud1uUwiHw1xgt9vRdrulyWTC45bL5dsM4IohgphOpzmQ1uVymRggFzBNkzabDa1WK5rN - ZtwVV8vn85yIyEiGJBCAgdPpNAVFUX4ej0fa7/c0n885eTQaUb/f50+JZhCvSCaTXKxUKpHNZnsWQqFQ - AoXpdMqvARHMAgkggDMMDUASOENUURRijGWEYDD4Rpblz4FAoI+mxWJB6/WaDxMC16GBiNngm2CMjRlj - X0RRfHv7JP1+/4PP5/vq9Xp/FAoFLgIxDBBPHIvFEPnAGPsuiuL7v/4LHo/ngyRJIbfb/QIi7hwIBEDW - GWOP1v5XAlc4nc6PDocjZbfb8zab7ZP1/J8C/4vfXG8tHKjVxdQAAAAASUVORK5CYII= - - R0lGODlhEAAQAIQfAOvGUf7ztuvPMf/78/fkl/Pbg+u8Rvjqteu2Pf3zxPz36Pz0z+vTmPzurPvuw/np @@ -248,6 +223,31 @@ b6AQ75sCVnsVfDHIceuzCVkfYyw4KQ2Mqa8QnWkVq15THp6eXNzdMla0d1nuyiIoVKNTHJMGrFWX2Jhu IjLRwPp4HeGRGrEaFNQEhh/it1TSde9IOmC327HZbAyVX+Bd6TnxUKYHZ+hVnsKQfwL9/eNoc4/SKT9M h+wQKpVKnLQN/mV+AQV66PCS6TFTAAAAAElFTkSuQmCC + + + + + R0lGODlhEAAQAIQAAJXD9Iasxm6MqnSn2lZtjVaRyEpXbYu767TX/2KZztvr/4Gy5KrT/3ut32+gzlFh + e+r0/0RNX9/u/9Ln+8Xg//n8/4e36CkxQz9GVkSCvKjL35/N/Je91K7T5bDS4////yH/C05FVFNDQVBF + Mi4wAwEBAAAh+QQAAAAAACwAAAAAEAAQAAAIuQA/CBxIsKDACRwScggQwIGAhwIICBDYQcEEgwg+bNjw + QKCHCQgkQBgpQcKBCg0AEBCoAaRIkhIsVBigUiAHCgwkKNjJU8GAAx0/3NwIAMABCwsaDHCwIGgAChuK + HjiQdMDSAQYEPpWKtKqDBA6yfgiAwGhXpUsTJIgg0AGCo0nRfi1QgO0HAQyQNpCrtkAGDAIFbKi69GsC + un8FEohqdEFavxkyXAhMoPKDBwYMRIiAAcOFoAZDCwwIADs= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAIcSURBVDhPjVPJqhpBFO1VFvmAt0g+Iav3E9nlM7LM + ZyS7rLoc2wFbbGi7bRBxJYojIk6o+BTFCQVHTKsIL1HfDaeIIv0IScGB4tY9Q93qFohIsCKbzX6LxWIz + WZZfAOxRs/YBrwqRSORBVdVfZFmoKYryztp/7ziSZfkiyzJFo1F6enqiy+VC5/OZWq0Wr+EMPei9JuIC + qqo+37uNx2PSdZ0ajQaHpmm8dr/+cATBMAy/YRjUbre5I1AsFikej1MwGOTAHjWkOZ1O1Gw2CRyv16sI + uq6fut0uVatVqtVq3BHu1nVNVKlUKJPJUCqVIkmSToKmaebhcKDlckmDwYCGwyFls1nq9Xq3RNjncjnq + dDqUSCQ46vU6ud1uUwiHw1xgt9vRdrulyWTC45bL5dsM4IohgphOpzmQ1uVymRggFzBNkzabDa1WK5rN + ZtwVV8vn85yIyEiGJBCAgdPpNAVFUX4ej0fa7/c0n885eTQaUb/f50+JZhCvSCaTXKxUKpHNZnsWQqFQ + AoXpdMqvARHMAgkggDMMDUASOENUURRijGWEYDD4Rpblz4FAoI+mxWJB6/WaDxMC16GBiNngm2CMjRlj + X0RRfHv7JP1+/4PP5/vq9Xp/FAoFLgIxDBBPHIvFEPnAGPsuiuL7v/4LHo/ngyRJIbfb/QIi7hwIBEDW + GWOP1v5XAlc4nc6PDocjZbfb8zab7ZP1/J8C/4vfXG8tHKjVxdQAAAAASUVORK5CYII= @@ -335,10 +335,10 @@ P/V955x7T1/AksaeqnEVX9W/zu3bl3vv9+v/953Tt7HZtmM7tmM7tmM7tmM7bDabvWXy++kti3+f1Ljw A1JGm/fvks97/5aU1TT/N29S2iXnX1rP+WcRQTkDBaFFD1bSznyFP1Zx+cMvQnLv3NhRW/u+9Trf2tiV e2t50P0aL14D95yv0fzFy6+lsw9f4tLoa6Q2OHzBOQOR1ut8a+NQWc/ahYfLuDW0huyLC0i/8C5a5DGD - tluFTvc9R3DWndWglJ5/tF7rWxnBWZ+vlnZ7RQIqsVaZlJak3/v6a3msefwC7Pa09f0FAzet1/pWhgLA - SXBSi0hvJVkAcLL++zNaSQrColDrAgodS4g98dWrvdl9pXvyen8QkO/4q29Snxb3f2DN663jYOngSkmX - SEpBoESMT1kmKZJV2xKGZn9+TwFrXUD7oxew25PWrY3ym1JQdn/vzoyuH1rze2MoACJ5LUH5iaraVgA4 - aZWsdIM43v/vy68tYWrBB88qcHN6/RtVtwuw24+u78nq67bm98YIIwC3VFK6rUUp+H/yAojpAn2fVg7a + tluFTvc9R3DWndWglJ5/tF7rWxnBWZ+vlnZ7RQIqsVaZlJak3/v6a3msefwC7Paj6/sLBm5ar/WtDAWA + k+CkFpHeSrIA4GT992e0khSERaHWBRQ6lhB74qtXe7P7Svfk9f4gIN/xV9+kPi3u/8Ca11vHwdLBlZIu + kZSCQIkYn7JMUiSrtiUMzf78ngLWuoD2Ry9gtyeuWxvlN6Wg7P7enRldP7Tm98ZQAETyWoLyE1W1rQBw + 0ipZ6QZxvP/fl19bwtSCD55V4Ob0+jeqbhdgt6eu78nq67bm98YIIwC3VFK6rUUp+H/yAojpAn2fVg7a aP69Ki3t/LLcNp5LOs+AvfHvTS0ir30RrcOvsCenf9Fud3zHmuOWsWNH7fvUA4pvepF2wWs5sboh/aI6 EB2Q9T0TiH4uQzTbaMduBnrD36h9F633Q/sWkH15CcFHe5f2ZXR9z5rnlvFju+M7BKDophdJjW7NxkKZ 8mbpouLGpeSN+Ce1yTFbJWIc84ZzvY3o/uQ59uQOLL4TgE8/7f8grKRnrfCGF/F100hsdImktZvI1G9G @@ -382,7 +382,7 @@ TW2Z55koq20ZAfljNPUlWXP2i/2Fd3md/8sYB35p72QQ+Y5ZftJz8MRTxNS4WXZNDKLWzTODAUQvEVkm olS0MmkQELhUjBLxarOJbKDa+oKnVCoP2S8UEHPlaU6pBCmh0SNeX1xCUPaAd2929z9Yc/YLBeDD6Kv4 RbSDvxPkdswhvPwJIk85EV3tQky125CdRj8YCogAIUYqFQGEoRgwBAizRFTP8G+gmzZP5QrdHdQ4tfVF - QtMsAyAYdnvyelB2X5M13w0hALjw88gr+DDqCjLbaNU3hdAyegrkEqpyCRA8mjBYBgxygwnjiAGB3OHZ + QtMsAyAYdnvSelB2X5M13w0hALjw88gr+DDqCjLbaNU3hdAyegrkEqpyCRA8mjBYBgxygwnjiAGB3OHZ 4Iw46Qx9WqWZRG+cqldscIbflCocQbaPrZ3hY6lMQjL75vZkdv2LNd8NQQAKOl342eEO/D6lG9mXFxFe Po6Dnz1DVKULUVUuRFXO8MgglNgZLsTUkDQQ3CdoFCUSq7nDcIXmCNEztKlV9QzpCKNnWGYRsQwXzZMg xNfT9WcYBj2FDsruH7TmumkoADsi2vmZf3ydCwdK6THYDCceSRBY9FpuW0EYzpDlYi0PJcMZqnlaXLHp @@ -392,11 +392,11 @@ OyDzdrQ1zy3jQNFdnPtiGc4FH8LLRhF8bJgh7Ct+jNDj4xY9YYWVKU0gvGxCjOWkpwg/YYr6yCFSxSQO VTxDRMWk0MkpHCadcgqddiKSVOlEVCUtvclVNE4jpmoGMdUzAuCZGVlWLh6pv0SenkJY+Thi69zcRAOz +730f0nWPLeM0JIH/MCAfggNKRxG8LEhTfRaE71vEf2Nn4pGEFI4IkapfVYVP2bt18b9JUqjOFA6igM8 - joltqdDjY/4qG0NY2TgiKp6xMyLt8euBWf3V1hy3jOJ+fHDw+Jf8wCC5cZY/QbrhdwFglTV5q3QABghK + joltqdDjY/4qG0NY2TgiKp6xMyLtceuBWf3V1hy3jOJ+fHDw+Jf8wCC5cZY/QbrhdwFglTV5q3QABghK 3AKBQShpEFgaBFqvUOlQiQTb777ck9H1I2ueW0ae48WHIfl3+WFhZO3cn7Uiql3YlWn+NvhWcbi8v+5I jcO3K60HQXkPsL/oEQ4UD31zKhlCaPEQQmlUoh9i1Fg6zApjjSDs+OYKPz6Cg2VKjxFWMoRA++3X//FR - SqLNZvsnm832dv8u98N//tFP/+1/Ptlps9n+80+o/9pk31Z6l2PfRpT8dmzHdmzHdmzHdmzHdrwp/h8w - TliMzfocqQAAAABJRU5ErkJggg== + SqLNZvsnm832dv8u98N//tFP/+1/Ptlps9n+80+o/9pk31Z6l2PfRpT8dmzHdmzHdmzHdmzHdrwp/h9d + k1iG/rMj4QAAAABJRU5ErkJggg== diff --git a/ArinWarev1/MdiMain.vb b/ArinWarev1/MdiMain.vb index 3dad666..abf7de0 100644 --- a/ArinWarev1/MdiMain.vb +++ b/ArinWarev1/MdiMain.vb @@ -257,9 +257,9 @@ Public Class MdiMain Dim wwwPath = Path.Combine(Application.StartupPath, "wwwroot") webServer = New StaticFileServer(wwwPath, 58123) webServer.Start() - If System.Diagnostics.Debugger.IsAttached Then - webServer.OpenInBrowser() - End If + 'If System.Diagnostics.Debugger.IsAttached Then + ' webServer.OpenInBrowser() + 'End If Catch ex As Exception ' 웹 서버 시작 실패해도 프로그램은 계속 실행 Debug.WriteLine("웹 서버 시작 실패: " & ex.Message) @@ -3984,4 +3984,18 @@ ENDSTAT: '//오류발생시 강제종료를 위한 분기문 Dim f As New Frm_Macro2 f.Show() End Sub + + + Dim frmManual As Frm_WebManual = Nothing + Private Sub ManualToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ManualToolStripMenuItem.Click + If frmManual Is Nothing OrElse frmManual.IsDisposed Then + frmManual = New Frm_WebManual() + frmManual.Show() + End If + If frmManual.WindowState = FormWindowState.Minimized Then + frmManual.WindowState = FormWindowState.Normal + End If + frmManual.Activate() + + End Sub End Class \ No newline at end of file diff --git a/ArinWarev1/app.config b/ArinWarev1/app.config index 7b2939f..f11d58a 100644 --- a/ArinWarev1/app.config +++ b/ArinWarev1/app.config @@ -29,7 +29,7 @@ - + <?xml version="1.0" standalone="yes"?> diff --git a/ArinWarev1/packages.config b/ArinWarev1/packages.config index c180c35..f49c8aa 100644 --- a/ArinWarev1/packages.config +++ b/ArinWarev1/packages.config @@ -1,8 +1,9 @@ - + + - + \ No newline at end of file diff --git a/CEnergy/ArinClassV2/CEnergy.vbproj b/CEnergy/ArinClassV2/CEnergy.vbproj index 0f263e7..39cdbc9 100644 --- a/CEnergy/ArinClassV2/CEnergy.vbproj +++ b/CEnergy/ArinClassV2/CEnergy.vbproj @@ -36,7 +36,7 @@ 1.0.0.%2a false true - v4.0 + v4.8 diff --git a/CEnergy/ArinClassV2/app.config b/CEnergy/ArinClassV2/app.config index 2ad693d..9bdd16a 100644 --- a/CEnergy/ArinClassV2/app.config +++ b/CEnergy/ArinClassV2/app.config @@ -25,4 +25,4 @@ - + diff --git a/Utility/Utility.csproj b/Utility/Utility.csproj index 6d630f5..7e5d5c6 100644 --- a/Utility/Utility.csproj +++ b/Utility/Utility.csproj @@ -10,7 +10,7 @@ Properties Utility Utility - v4.0 + v4.8 512