diff --git a/C_TDSet.cpp b/C_TDSet.cpp index 083ad8d..eb54b68 100644 --- a/C_TDSet.cpp +++ b/C_TDSet.cpp @@ -208,6 +208,11 @@ BOOL CC_TDSet::ShowInList(ANS_GetTD2Data * pData,long lItem2,POSITION pos) str.Format(_T(" %d"),pData->lSendRet); m_wndList.SetItemText( lItem , lTemp11++ , str ) ; + //�������� + str.Format(_T(" %d"), pData->lBFPriority); + m_wndList.SetItemText(lItem, lTemp11++, str); + + //ÿ�ն����� str.Format( _T("%d") , pData->Day_Send - pData->Day_ReportFail ); m_wndList.SetItemText(lItem,lTemp11++,str); @@ -447,7 +452,7 @@ BOOL CC_TDSet::OnInitDialog() m_Image.Add(AfxGetApp()->LoadIcon(IDI_L_MANAGER) ); m_Image.Add(AfxGetApp()->LoadIcon(IDI_L_LOCK) ); m_wndList.SubClassWindow2(); - m_wndList.SetHeadings(_T("���,50;ͨ������,100;�����,150;�����˺�,120;����,60;Ĭ��,60;����,60;��Ӫ��,90;���к�,80;ͨ����,80;SendRet,80;���ն�����,100;ʧ����,80;���¶�����,100;ʧ����,80;��ע,200;")); + m_wndList.SetHeadings(_T("���,50;ͨ������,100;�����,150;�����˺�,120;����,60;Ĭ��,60;����,60;��Ӫ��,90;���к�,80;ͨ����,80;SendRet,80;��������,80;���ն�����,100;ʧ����,80;���¶�����,100;ʧ����,80;��ע,200;")); m_wndList.SetGridLines(true); m_wndList.SetImageList(&m_Image,LVSIL_SMALL); @@ -506,6 +511,7 @@ void CC_TDSet::On_User_Add() TD2Data.lStatus = 1; //Ĭ�������� TD2Data.lLimits=1; //Ĭ�ϵڶ����� TD2Data.lOftenUse = 1;//�¼ӵ�Ϊ����ͨ�� + TD2Data.lBFPriority = 100; //Ĭ�ϲ�������Ϊ��� DLG_C_TDSet_Modify dlg(this); dlg.SetParam( TD2Data); if ( dlg.DoModal() == IDOK ) diff --git a/DLG_C_TDSet_Modify1.cpp b/DLG_C_TDSet_Modify1.cpp index f705e4e..6adf239 100644 --- a/DLG_C_TDSet_Modify1.cpp +++ b/DLG_C_TDSet_Modify1.cpp @@ -31,6 +31,7 @@ DLG_C_TDSet_Modify::DLG_C_TDSet_Modify(CWnd* pParent /*=NULL*/) , m_bGGTD(FALSE) , m_bOftenUse(FALSE) , m_strLoginName(_T("")) + , m_lBFPriority(0) { //{{AFX_DATA_INIT(DLG_C_TDSet_Modify) m_strBZ = _T(""); @@ -82,6 +83,7 @@ void DLG_C_TDSet_Modify::DoDataExchange(CDataExchange* pDX) DDX_Check(pDX, IDC_TDSET_MODIFY_OFTENUSE, m_bOftenUse); DDX_Text(pDX, IDC_TDSET_MODIFY_LOGINNAME, m_strLoginName); DDV_MaxChars(pDX, m_strLoginName, 15); + DDX_Text(pDX, IDC_TDSET_MODIFY_BFPRIORITY, m_lBFPriority); } @@ -134,6 +136,8 @@ BOOL DLG_C_TDSet_Modify::OnInitDialog() m_lXYLen = m_TDData.lXYLen; m_lXYTDID = m_TDData.lXYTDID; + m_lBFPriority = m_TDData.lBFPriority; + m_strMsg.Format( _T("�����ύ:%d\r\n����:%d\r\n�ɹ�:%d\r\nʧ��:%d\r\n�Ʒ�:%d\r\n\r\n�����ύ:%d\r\n����:%d\r\n�ɹ�:%d\r\nʧ��:%d\r\n�Ʒ�:%d") , m_TDData.Day_Submit , m_TDData.Day_Send,m_TDData.Day_ReportSucess,m_TDData.Day_ReportFail , m_TDData.Day_Send - m_TDData.Day_ReportFail, m_TDData.Mon_Submit , m_TDData.Mon_Send,m_TDData.Mon_ReportSucess,m_TDData.Mon_ReportFail , m_TDData.Mon_Send - m_TDData.Mon_ReportFail); @@ -188,5 +192,7 @@ void DLG_C_TDSet_Modify::OnBnClickedOk() m_TDData.lXYTDID = m_lXYTDID; m_TDData.lXYLen = m_lXYLen; + m_TDData.lBFPriority = m_lBFPriority; + CDialog::OnOK(); } diff --git a/DLG_C_TDSet_Modify1.h b/DLG_C_TDSet_Modify1.h index 0e25c75..428e257 100644 --- a/DLG_C_TDSet_Modify1.h +++ b/DLG_C_TDSet_Modify1.h @@ -66,6 +66,7 @@ public: BOOL m_bGGTD; BOOL m_bOftenUse; CString m_strLoginName; + int m_lBFPriority; }; //{{AFX_INSERT_LOCATION}} diff --git a/Debug_Unicode/SmsManager.exe b/Debug_Unicode/SmsManager.exe index d12deac..8a7e5bf 100644 Binary files a/Debug_Unicode/SmsManager.exe and b/Debug_Unicode/SmsManager.exe differ diff --git a/Debug_Unicode/SmsManager.res b/Debug_Unicode/SmsManager.res index ebb99ce..cc6f144 100644 Binary files a/Debug_Unicode/SmsManager.res and b/Debug_Unicode/SmsManager.res differ diff --git a/Debug_Unicode/SmsManager.tlog/CL.read.1.tlog b/Debug_Unicode/SmsManager.tlog/CL.read.1.tlog index ab590fb..90c2a1b 100644 Binary files a/Debug_Unicode/SmsManager.tlog/CL.read.1.tlog and b/Debug_Unicode/SmsManager.tlog/CL.read.1.tlog differ diff --git a/Debug_Unicode/SmsManager.tlog/CL.write.1.tlog b/Debug_Unicode/SmsManager.tlog/CL.write.1.tlog index 612b409..bc1070b 100644 Binary files a/Debug_Unicode/SmsManager.tlog/CL.write.1.tlog and b/Debug_Unicode/SmsManager.tlog/CL.write.1.tlog differ diff --git a/Debug_Unicode/vc143.idb b/Debug_Unicode/vc143.idb index 25b6165..e8b8f6f 100644 Binary files a/Debug_Unicode/vc143.idb and b/Debug_Unicode/vc143.idb differ diff --git a/Release_Unicode/SmsManager.tlog/CL.command.1.tlog b/Release_Unicode/SmsManager.tlog/CL.command.1.tlog index f593c12..4cf90f4 100644 Binary files a/Release_Unicode/SmsManager.tlog/CL.command.1.tlog and b/Release_Unicode/SmsManager.tlog/CL.command.1.tlog differ diff --git a/Release_Unicode/SmsManager.tlog/CL.read.1.tlog b/Release_Unicode/SmsManager.tlog/CL.read.1.tlog index c124904..75f0f12 100644 Binary files a/Release_Unicode/SmsManager.tlog/CL.read.1.tlog and b/Release_Unicode/SmsManager.tlog/CL.read.1.tlog differ diff --git a/Release_Unicode/SmsManager.tlog/CL.write.1.tlog b/Release_Unicode/SmsManager.tlog/CL.write.1.tlog index 6b59baa..d8d9d64 100644 Binary files a/Release_Unicode/SmsManager.tlog/CL.write.1.tlog and b/Release_Unicode/SmsManager.tlog/CL.write.1.tlog differ diff --git a/Release_Unicode/SmsManager3.exe b/Release_Unicode/SmsManager3.exe index 9a94421..a4abdff 100644 Binary files a/Release_Unicode/SmsManager3.exe and b/Release_Unicode/SmsManager3.exe differ diff --git a/SmsManager.rc b/SmsManager.rc index d857b23..a83d75c 100644 --- a/SmsManager.rc +++ b/SmsManager.rc @@ -4286,17 +4286,23 @@ BEGIN EDITTEXT IDC_TDSET_MODIFY_NAME,50,33,74,12,ES_AUTOHSCROLL EDITTEXT IDC_TDSET_MODIFY_ACCESSPORT,50,48,74,12,ES_AUTOHSCROLL EDITTEXT IDC_TDSET_MODIFY_LOGINNAME,164,33,43,12,ES_AUTOHSCROLL + EDITTEXT IDC_TDSET_MODIFY_SENDRET,178,18,29,12,ES_AUTOHSCROLL | ES_NUMBER COMBOBOX IDC_TDSET_MODIFY_ABILITY,50,72,74,171,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_TDSET_MODIFY_TYPE,50,88,74,171,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_TDSET_MODIFY_LIMITS,50,104,74,171,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_TDSET_MODIFY_TDNUM,50,120,74,171,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_TDSET_MODIFY_MODE,50,136,74,171,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "���ô�ͨ��",IDC_TDSET_MODIFY_STATUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,157,53,10 - CONTROL "������Ĭ��ͨ��",IDC_TDSET_MODIFY_DEFAULTTD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,171,68,10 EDITTEXT IDC_TDSET_MODIFY_CONTENTLEN,182,73,21,12,ES_AUTOHSCROLL | ES_NUMBER EDITTEXT IDC_TDSET_MODIFY_LONGCONTENTLEN,183,88,21,12,ES_AUTOHSCROLL | ES_NUMBER EDITTEXT IDC_TDSET_MODIFY_SIGNLEN,182,104,21,12,ES_AUTOHSCROLL | ES_NUMBER - EDITTEXT IDC_TDSET_MODIFY_BZ,47,186,154,35,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL + EDITTEXT IDC_TDSET_MODIFY_XYLEN,182,120,21,12,ES_AUTOHSCROLL | ES_NUMBER + EDITTEXT IDC_TDSET_MODIFY_XYTDID,181,136,21,12,ES_AUTOHSCROLL | ES_NUMBER + CONTROL "���ô�ͨ��",IDC_TDSET_MODIFY_STATUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,157,53,10 + CONTROL "��ͨ���ɷ�Ӫ��",IDC_TDSET_MODIFY_GGTD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,137,157,68,10 + CONTROL "������Ĭ��ͨ��",IDC_TDSET_MODIFY_DEFAULTTD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,171,68,10 + CONTROL "��ͨ������",IDC_TDSET_MODIFY_OFTENUSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,137,172,68,10 + EDITTEXT IDC_TDSET_MODIFY_BFPRIORITY,49,184,30,12,ES_AUTOHSCROLL | ES_NUMBER + EDITTEXT IDC_TDSET_MODIFY_BZ,47,199,154,35,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL DEFPUSHBUTTON "ȷ ��",IDOK,250,46,50,21 PUSHBUTTON "ȡ ��",IDCANCEL,250,80,50,21 EDITTEXT IDC_TDSET_MODIFY_MSG,222,132,100,101,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | ES_WANTRETURN | WS_VSCROLL @@ -4304,7 +4310,7 @@ BEGIN GROUPBOX "��������",IDC_STATIC,6,7,205,234 LTEXT "ͨ������",IDC_STATIC,15,34,31,8 LTEXT "��Ӫ��",IDC_STATIC,15,90,23,8 - LTEXT "�� ע",IDC_STATIC,15,188,24,8 + LTEXT "�� ע",IDC_STATIC,15,201,24,8 ICON IDR_MAINFRAME,IDC_STATIC,262,16,20,20 LTEXT "ͨ��״̬",IDC_STATIC,15,158,31,8 LTEXT "Ĭ��ͨ��",IDC_STATIC,15,173,31,8 @@ -4318,15 +4324,12 @@ BEGIN LTEXT "�������",IDC_STATIC,132,75,46,8 LTEXT "�����ų���",IDC_STATIC,140,90,38,8 LTEXT "ǩ������",IDC_STATIC,147,106,31,8 - EDITTEXT IDC_TDSET_MODIFY_SENDRET,178,18,29,12,ES_AUTOHSCROLL | ES_NUMBER LTEXT "����ID(SendRet)",IDC_STATIC,117,20,60,8 - EDITTEXT IDC_TDSET_MODIFY_XYLEN,182,120,21,12,ES_AUTOHSCROLL | ES_NUMBER - EDITTEXT IDC_TDSET_MODIFY_XYTDID,181,136,21,12,ES_AUTOHSCROLL | ES_NUMBER LTEXT "С������",IDC_STATIC,146,123,31,8 LTEXT "תͨ��ID",IDC_STATIC,146,138,31,8 - CONTROL "��ͨ���ɷ�Ӫ��",IDC_TDSET_MODIFY_GGTD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,137,157,68,10 - CONTROL "��ͨ������",IDC_TDSET_MODIFY_OFTENUSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,137,172,68,10 LTEXT "�����ʺ�",IDC_STATIC,130,35,30,8 + LTEXT "��������",IDC_STATIC,15,185,31,8 + LTEXT "(����Խ��Խ���ȣ�0���μӲ�����",IDC_STATIC,85,185,108,8 END IDD_C_TRANSCODESET_MODIFY DIALOGEX 0, 0, 247, 115 diff --git a/resource.h b/resource.h index 658988f..a895d6b 100644 --- a/resource.h +++ b/resource.h @@ -1633,6 +1633,7 @@ #define IDC_CORP_MODIFY_FAX_PRICEYE_S 2026 #define IDC_TDSET_MODIFY_LOGINNAME 2026 #define IDC_CORP_MODIFY_FAX_PRICEALL_S 2027 +#define IDC_TDSET_MODIFY_BFPRIORITY 2027 #define IDC_CORP_MODIFY_AGENT_S 2028 #define IDC_CORP_MODIFY_YWY_S 2029 #define IDC_CORP_MODIFY_KF_S 2030