Skip to content

Commit a93a84e

Browse files
committed
fixed:announcement context Garbled characters
1 parent d9f7d89 commit a93a84e

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

XEngine_Source/XEngine_APPService/XEngine_AuthorizeApp/Authorize_Dialog/Dialog_Announcement.cpp

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@ void CDialog_Announcement::OnBnClickedButton1()
147147
OnBnClickedButton3();
148148
}
149149

150-
151150
void CDialog_Announcement::OnBnClickedButton2()
152151
{
153152
// TODO: 在此添加控件通知处理程序代码
@@ -236,7 +235,6 @@ void CDialog_Announcement::OnBnClickedButton2()
236235
OnBnClickedButton3();
237236
}
238237

239-
240238
void CDialog_Announcement::OnBnClickedButton3()
241239
{
242240
// TODO: 在此添加控件通知处理程序代码
@@ -307,20 +305,19 @@ void CDialog_Announcement::OnBnClickedButton3()
307305
{
308306
Json::Value st_JsonArray = st_JsonRoot["Array"][i];
309307

310-
XCHAR tszMsgBuffer[2048];
308+
TCHAR tszMsgBuffer[2048];
311309
TCHAR tszIndex[64];
312310

313311
memset(tszMsgBuffer, '\0', sizeof(tszMsgBuffer));
314312
memset(tszIndex, '\0', 64);
315313

316314
_i64tot(st_JsonArray["nID"].asInt64(), tszIndex, 10);
317-
318315
int nMsgLen = st_JsonArray["tszContext"].asString().length();
319-
BaseLib_Charset_UTFToAnsi(st_JsonArray["tszContext"].asCString(), tszMsgBuffer, &nMsgLen);
316+
BaseLib_Charset_UTFToUnicode(st_JsonArray["tszContext"].asCString(), tszMsgBuffer, &nMsgLen);
320317

321318
m_ListAnnouncement.InsertItem(i, _T(""));
322319
m_ListAnnouncement.SetItemText(i, 0, tszIndex);
323-
m_ListAnnouncement.SetItemText(i, 1, A2W(tszMsgBuffer));
320+
m_ListAnnouncement.SetItemText(i, 1, tszMsgBuffer);
324321
m_ListAnnouncement.SetItemText(i, 2, A2W(st_JsonArray["tszCreateTime"].asCString()));
325322
}
326323
BaseLib_Memory_FreeCStyle((XPPMEM)&ptszMsgBuffer);

XEngine_Source/XEngine_APPService/XEngine_AuthorizeApp/XEngine_AuthorizeAppDlg.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,13 @@ BOOL CXEngineAuthorizeAppDlg::OnInitDialog()
7171
// 执行此操作
7272
SetIcon(m_hIcon, true); // 设置大图标
7373
SetIcon(m_hIcon, false); // 设置小图标
74+
#ifndef _DEBUG
7475
if (setlocale(LC_ALL, ".UTF8") == NULL)
7576
{
7677
AfxMessageBox(_T("Error setting locale.\n"));
7778
return false;
7879
}
80+
#endif
7981

8082
// TODO: 在此添加额外的初始化代码
8183
SetUnhandledExceptionFilter(Coredump_ExceptionFilter);

XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/XEngine_AuthorizeService.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,13 @@ int main(int argc, char** argv)
125125
WSAStartup(MAKEWORD(2, 2), &st_WSAData);
126126

127127
SetUnhandledExceptionFilter(Coredump_ExceptionFilter);
128+
#ifndef _DEBUG
128129
if (setlocale(LC_ALL, ".UTF8") == NULL)
129-
{
130+
{
130131
fprintf(stderr, "Error setting locale.\n");
131132
return 1;
132133
}
134+
#endif
133135
#endif
134136
bIsRun = true;
135137
int nRet = -1;

0 commit comments

Comments
 (0)