From 847a34f02bfe00475735fb5bfbefea2db28c8ad6 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期六, 24 一月 2026 17:15:48 +0800
Subject: [PATCH] 1.修复前烘-b, 后烘-b没有进入b分支导致数据没有推送到显示端的问题；
---
SourceCode/Bond/EAPSimulator/EAPSimulator.rc | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/SourceCode/Bond/EAPSimulator/EAPSimulator.rc b/SourceCode/Bond/EAPSimulator/EAPSimulator.rc
index b577063..92e768e 100644
--- a/SourceCode/Bond/EAPSimulator/EAPSimulator.rc
+++ b/SourceCode/Bond/EAPSimulator/EAPSimulator.rc
@@ -54,10 +54,10 @@
"\r\n"
"#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHS)\r\n"
"LANGUAGE 4, 2\r\n"
- "#include ""res\\EAPSimulator.rc2"" // 闂�?Microsoft Visual C++ 缂傛牞绶惃鍕カ濠�?\n"
- "#include ""l.CHS\\afxres.rc"" // 閺嶅洤鍣紒鍕\r\n"
+ "#include ""res\\EAPSimulator.rc2"" // 闂�?Microsoft Visual C++ 缂傚倸鍊归悧鐐垫椤愶附鍎嶉柛鏇ㄥ枤閵堫偅绻�?\n"
+ "#include ""l.CHS\\afxres.rc"" // 闂佸搫绉村ú銈夊闯椤栨粎纾奸柛鏇ㄤ簼椤�?\n"
"#if !defined(_AFXDLL)\r\n"
- "#include ""l.CHS\\afxribbon.rc"" // MFC 閸旂喕鍏橀崠鍝勬嫲閹貉冨煑閺壜ょカ濠�?\n"
+ "#include ""l.CHS\\afxribbon.rc"" // MFC 闂佸憡姊婚崰鏇㈠礂濮椻偓瀹曠娀宕崟顒�顏梺纭呯焽閸愩劎鍘梺鍝勵棥閵堝洢鍋掑┑?\n"
"#endif\r\n"
"#endif\r\n"
"\0"
@@ -92,17 +92,17 @@
DEFPUSHBUTTON "纭畾",IDOK,113,41,50,14,WS_GROUP
END
-IDD_EAPSIMULATOR_DIALOG DIALOGEX 0, 0, 469, 292
+IDD_EAPSIMULATOR_DIALOG DIALOGEX 0, 0, 469, 319
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
EXSTYLE WS_EX_APPWINDOW
CAPTION "EAPSimulator"
FONT 9, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- DEFPUSHBUTTON "纭畾",IDOK,246,271,50,14,NOT WS_VISIBLE
- PUSHBUTTON "鍙栨秷",IDCANCEL,412,271,50,14,NOT WS_VISIBLE
- EDITTEXT IDC_EDIT_LOG,7,218,455,67,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL
- LTEXT "鏃ュ織锛�",IDC_STATIC,7,203,24,8
- GROUPBOX "鍔熻兘",IDC_STATIC,7,7,455,190
+ DEFPUSHBUTTON "纭畾",IDOK,246,298,50,14,NOT WS_VISIBLE
+ PUSHBUTTON "鍙栨秷",IDCANCEL,412,298,50,14,NOT WS_VISIBLE
+ EDITTEXT IDC_EDIT_LOG,7,245,455,67,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL
+ LTEXT "鏃ュ織锛�",IDC_STATIC,7,234,24,8
+ GROUPBOX "鍔熻兘",IDC_STATIC,7,7,455,223
LTEXT "IP:",IDC_STATIC,24,20,11,8
EDITTEXT IDC_EDIT_IP,39,17,94,14,ES_AUTOHSCROLL
LTEXT "Port:",IDC_STATIC,141,20,17,8
@@ -127,7 +127,9 @@
PUSHBUTTON "S1F3_QueryPJSpace",IDC_BUTTON_QUERY_PJ_SPACE,350,82,108,14
PUSHBUTTON "S16F15_Create PJ",IDC_BUTTON_CREATE_PJ,350,101,108,14
PUSHBUTTON "S14F9_Create CJ",IDC_BUTTON_CREATE_CJ,14,120,108,14
- EDITTEXT IDC_EDIT_DELETE_PPID,283,152,79,14,ES_AUTOHSCROLL
+ EDITTEXT IDC_EDIT_PPID_REQ,284,170,78,14,ES_AUTOHSCROLL
+ PUSHBUTTON "S7F5_Request PP",IDC_BUTTON_PP_REQUEST,364,170,95,14
+ EDITTEXT IDC_EDIT_DELETE_PPID,284,152,78,14,ES_AUTOHSCROLL
PUSHBUTTON "S7F17_Delete PPID",IDC_BUTTON_DELETE_PPID,364,152,95,14
END
@@ -297,7 +299,7 @@
LEFTMARGIN, 7
RIGHTMARGIN, 462
TOPMARGIN, 7
- BOTTOMMARGIN, 285
+ BOTTOMMARGIN, 312
END
IDD_DIALOG_TERMINAL_DISPLAY, DIALOG
@@ -440,10 +442,10 @@
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHS)
LANGUAGE 4, 2
-#include "res\EAPSimulator.rc2" // 闈� Microsoft Visual C++ 缂栬緫鐨勮祫婧�
-#include "l.CHS\afxres.rc" // 鏍囧噯缁勪欢
+#include "res\EAPSimulator.rc2" // 闂�?Microsoft Visual C++ 缂傚倹鐗炵欢顐︽儍閸曨喚銈繝?
+#include "l.CHS\afxres.rc" // 闁哄秴娲ら崳顖滅磼閸曨亝顐�
#if !defined(_AFXDLL)
-#include "l.CHS\afxribbon.rc" // MFC 鍔熻兘鍖哄拰鎺у埗鏉¤祫婧�
+#include "l.CHS\afxribbon.rc" // MFC 闁告梻鍠曢崗姗�宕犻崫鍕闁硅矇鍐ㄧ厬闁哄銈囥偒婵�?
#endif
#endif
--
Gitblit v1.9.3