diff --git a/DLG_Agent_Modify.cpp b/DLG_Agent_Modify.cpp index 622562f..31c04ab 100644 --- a/DLG_Agent_Modify.cpp +++ b/DLG_Agent_Modify.cpp @@ -136,7 +136,7 @@ void DLG_Agent_Modify::DoDataExchange(CDataExchange* pDX) DDX_Text(pDX, IDC_AGENT_MODIFY_OEMNAME, m_strOEMName); DDV_MaxChars(pDX, m_strOEMName, 7); DDX_Text(pDX, IDC_AGENT_MODIFY_REPORTPER, m_lReportPer); - DDV_MinMaxUInt(pDX, m_lReportPer, 0, 100); + DDV_MinMaxUInt(pDX, m_lReportPer, 0, 102); DDX_Check(pDX, IDC_AGENT_MODIFY_YJ, m_bYJ); DDX_Text(pDX, IDC_AGENT_MODIFY_S_AGENTNAME, m_strS_AgentName); DDV_MaxChars(pDX, m_strS_AgentName, 63); diff --git a/DLG_Corp_CustomSettings.cpp b/DLG_Corp_CustomSettings.cpp index 9ecd286..fb2a0d8 100644 --- a/DLG_Corp_CustomSettings.cpp +++ b/DLG_Corp_CustomSettings.cpp @@ -39,6 +39,10 @@ DLG_Corp_CustomSettings::DLG_Corp_CustomSettings(CWnd* pParent /*=nullptr*/) , m_strAntiannoys_24Hrs_Same(_T("")) , m_strAntiannoys_24Hrs_Diffrent(_T("")) , m_strAntiannoys_24Hrs_VerificationCode(_T("")) + , m_strMultCM0(_T("")) + , m_strMultCM1(_T("")) + , m_strMultCM3(_T("")) + , m_bMultCM(FALSE) { m_pMainFrame = NULL; m_pSettingsAns = NULL; @@ -78,6 +82,13 @@ void DLG_Corp_CustomSettings::DoDataExchange(CDataExchange* pDX) DDX_Text(pDX, IDC_CORP_CUSTOM_SETTINGS_ANTIANNOYS_24HRS_SAME, m_strAntiannoys_24Hrs_Same); DDX_Text(pDX, IDC_CORP_CUSTOM_SETTINGS_ANTIANNOYS_24HRS_DIFFRENT, m_strAntiannoys_24Hrs_Diffrent); DDX_Text(pDX, IDC_CORP_CUSTOM_SETTINGS_ANTIANNOYS_24HRS_VERIFICATIONCODE, m_strAntiannoys_24Hrs_VerificationCode); + DDX_Text(pDX, IDC_CORP_CUSTOM_SETTINGS_MULTCM_0, m_strMultCM0); + DDV_MaxChars(pDX, m_strMultCM0, 20); + DDX_Text(pDX, IDC_CORP_CUSTOM_SETTINGS_MULTCM_1, m_strMultCM1); + DDV_MaxChars(pDX, m_strMultCM1, 20); + DDX_Text(pDX, IDC_CORP_CUSTOM_SETTINGS_MULTCM_3, m_strMultCM3); + DDV_MaxChars(pDX, m_strMultCM3, 20); + DDX_Check(pDX, IDC_CORP_CUSTOM_SETTINGS_MULTCM_ENABLE, m_bMultCM); } @@ -133,6 +144,12 @@ BOOL DLG_Corp_CustomSettings::OnInitDialog() m_strSpeedLimit_CorpID.Format(_T("%d"), m_pSettingsAns->data.lSpeedLimit_CorpID); m_strSpeedLimit_IP.Format(_T("%d"), m_pSettingsAns->data.lSpeedLimit_IP); + //多运营商签名 + m_bMultCM = m_pSettingsAns->data.bMultCM; + m_strMultCM0 = m_pSettingsAns->data.szMultCMs[0]; + m_strMultCM1 = m_pSettingsAns->data.szMultCMs[1]; + m_strMultCM3 = m_pSettingsAns->data.szMultCMs[3]; + UpdateData(false); return TRUE; // return TRUE unless you set the focus to a control @@ -175,6 +192,12 @@ void DLG_Corp_CustomSettings::OnBnClickedOk() m_SettingsData.lSpeedLimit_CorpID = _ttol(m_strSpeedLimit_CorpID); m_SettingsData.lSpeedLimit_IP = _ttol(m_strSpeedLimit_IP); + //多运营商签名 + m_SettingsData.bMultCM = m_bMultCM; + _tcscpy(m_SettingsData.szMultCMs[0], m_strMultCM0); + _tcscpy(m_SettingsData.szMultCMs[1], m_strMultCM1); + _tcscpy(m_SettingsData.szMultCMs[3], m_strMultCM3); + m_SettingsData.lSettingID = m_pSettingsAns->data.lSettingID; m_SettingsData.lCorpID = m_pSettingsAns->data.lCorpID; diff --git a/DLG_Corp_CustomSettings.h b/DLG_Corp_CustomSettings.h index ecc214f..c2e5059 100644 --- a/DLG_Corp_CustomSettings.h +++ b/DLG_Corp_CustomSettings.h @@ -57,4 +57,8 @@ public: CString m_strAntiannoys_24Hrs_Same; CString m_strAntiannoys_24Hrs_Diffrent; CString m_strAntiannoys_24Hrs_VerificationCode; + CString m_strMultCM0; + CString m_strMultCM1; + CString m_strMultCM3; + BOOL m_bMultCM; }; diff --git a/DLG_Corp_Modify.cpp b/DLG_Corp_Modify.cpp index a367151..ecb46d6 100644 --- a/DLG_Corp_Modify.cpp +++ b/DLG_Corp_Modify.cpp @@ -202,7 +202,7 @@ void DLG_Corp_Modify::DoDataExchange(CDataExchange* pDX) DDV_MinMaxUInt(pDX, m_lAddressCount, 1, 999999); DDX_CBIndex(pDX, IDC_CORP_MODIFY_FSTEP, m_lFStep); DDX_Text(pDX, IDC_CORP_MODIFY_REPORTPER, m_lReportPer); - DDV_MinMaxUInt(pDX, m_lReportPer, 0, 100); + DDV_MinMaxUInt(pDX, m_lReportPer, 0, 102); DDX_Text(pDX, IDC_CORP_MODIFY_NOSENDBEGIN, m_lNoSendBegin); DDV_MinMaxUInt(pDX, m_lNoSendBegin, 0, 99999999); DDX_Text(pDX, IDC_CORP_MODIFY_NOSENDMAXPER, m_lNoSendMaxPer); diff --git a/Debug_Unicode/SmsManager.exe b/Debug_Unicode/SmsManager.exe index 3d65d26..ba85a42 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 968afc4..d82da5d 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 5429beb..aac3062 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 601a563..bc242ef 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/SmsManager.tlog/link.read.1.tlog b/Debug_Unicode/SmsManager.tlog/link.read.1.tlog index 35a17a8..c7e07c3 100644 Binary files a/Debug_Unicode/SmsManager.tlog/link.read.1.tlog and b/Debug_Unicode/SmsManager.tlog/link.read.1.tlog differ diff --git a/Debug_Unicode/SmsManager.tlog/link.write.1.tlog b/Debug_Unicode/SmsManager.tlog/link.write.1.tlog index 9484af2..22de1c6 100644 Binary files a/Debug_Unicode/SmsManager.tlog/link.write.1.tlog and b/Debug_Unicode/SmsManager.tlog/link.write.1.tlog differ diff --git a/Debug_Unicode/vc143.idb b/Debug_Unicode/vc143.idb index d4e98ae..c1be18b 100644 Binary files a/Debug_Unicode/vc143.idb and b/Debug_Unicode/vc143.idb differ diff --git a/MsChart/MSChart.exe b/MsChart/MSChart.exe new file mode 100644 index 0000000..5ca98b8 Binary files /dev/null and b/MsChart/MSChart.exe differ diff --git a/Release_Unicode/SmsManager.res b/Release_Unicode/SmsManager.res index c416be0..7e972f2 100644 Binary files a/Release_Unicode/SmsManager.res and b/Release_Unicode/SmsManager.res differ diff --git a/Release_Unicode/SmsManager3.exe b/Release_Unicode/SmsManager3.exe index 87a9d8f..e865d43 100644 Binary files a/Release_Unicode/SmsManager3.exe and b/Release_Unicode/SmsManager3.exe differ diff --git a/SmsManager.rc b/SmsManager.rc index 2942d70..869efc9 100644 --- a/SmsManager.rc +++ b/SmsManager.rc @@ -5428,7 +5428,7 @@ BEGIN LTEXT "",IDC_STATIC,113,114,15,8 END -IDD_CORP_CUSTOM_SETTINGS DIALOGEX 0, 0, 304, 237 +IDD_CORP_CUSTOM_SETTINGS DIALOGEX 0, 0, 304, 274 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "ҵƲ" FONT 9, "Microsoft Sans Serif", 400, 0, 0x0 @@ -5437,8 +5437,8 @@ BEGIN EDITTEXT IDC_CORP_CUSTOM_SETTINGS_CORPNAME,54,31,207,12,ES_AUTOHSCROLL | ES_READONLY EDITTEXT IDC_CORP_CUSTOM_SETTINGS_YWY,156,17,68,12,ES_AUTOHSCROLL | ES_READONLY EDITTEXT IDC_CORP_CUSTOM_SETTINGS_AGENT,54,45,205,12,ES_AUTOHSCROLL | ES_READONLY - DEFPUSHBUTTON "ȷ ",IDOK,191,202,50,21 - PUSHBUTTON "ȡ ",IDCANCEL,246,202,50,21 + DEFPUSHBUTTON "ȷ ",IDOK,191,246,50,21 + PUSHBUTTON "ȡ ",IDCANCEL,246,246,50,21 GROUPBOX "ҵϢ",IDC_STATIC,7,5,289,61 LTEXT "ͻ",IDC_STATIC,122,19,30,8 LTEXT "ҵ",IDC_STATIC,20,33,30,8 @@ -5483,13 +5483,21 @@ BEGIN EDITTEXT IDC_CORP_CUSTOM_SETTINGS_ANTIANNOYS_24HRS_DIFFRENT,263,155,24,13,ES_AUTOHSCROLL | ES_NUMBER LTEXT "24Сʱ-֤",IDC_STATIC,206,170,47,8 EDITTEXT IDC_CORP_CUSTOM_SETTINGS_ANTIANNOYS_24HRS_VERIFICATIONCODE,263,168,24,13,ES_AUTOHSCROLL | ES_NUMBER - GROUPBOX "API ",IDC_STATIC,7,193,175,36 + GROUPBOX "API ",IDC_STATIC,7,232,175,35 CONTROL "öAPIƣ/룩",IDC_CORP_CUSTOM_SETTINGS_SPEEDLIMIT_ENABLE, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,58,192,116,10 - LTEXT "ҵID",IDC_STATIC,14,210,37,8 - EDITTEXT IDC_CORP_CUSTOM_SETTINGS_SPEEDLIMIT_CORPID,54,208,24,13,ES_AUTOHSCROLL | ES_NUMBER - LTEXT "IPַ",IDC_STATIC,95,211,36,8 - EDITTEXT IDC_CORP_CUSTOM_SETTINGS_SPEEDLIMIT_IP,135,209,24,13,ES_AUTOHSCROLL | ES_NUMBER + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,58,231,116,10 + LTEXT "ҵID",IDC_STATIC,14,249,37,8 + EDITTEXT IDC_CORP_CUSTOM_SETTINGS_SPEEDLIMIT_CORPID,54,247,24,13,ES_AUTOHSCROLL | ES_NUMBER + LTEXT "IPַ",IDC_STATIC,95,250,36,8 + EDITTEXT IDC_CORP_CUSTOM_SETTINGS_SPEEDLIMIT_IP,135,248,24,13,ES_AUTOHSCROLL | ES_NUMBER + GROUPBOX "Ӫǩ ",IDC_STATIC,7,193,289,32 + CONTROL "öӪǩ",IDC_CORP_CUSTOM_SETTINGS_MULTCM_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,70,192,74,10 + LTEXT "ƶ",IDC_STATIC,15,209,15,8 + EDITTEXT IDC_CORP_CUSTOM_SETTINGS_MULTCM_0,33,207,53,13,ES_AUTOHSCROLL + LTEXT "ͨ",IDC_STATIC,100,209,15,8 + EDITTEXT IDC_CORP_CUSTOM_SETTINGS_MULTCM_1,118,207,53,13,ES_AUTOHSCROLL + LTEXT "",IDC_STATIC,189,209,15,8 + EDITTEXT IDC_CORP_CUSTOM_SETTINGS_MULTCM_3,207,207,53,13,ES_AUTOHSCROLL END IDD_CORP_EXPIRYRECYCLING DIALOGEX 0, 0, 322, 197 @@ -7149,7 +7157,7 @@ BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 296 TOPMARGIN, 7 - BOTTOMMARGIN, 230 + BOTTOMMARGIN, 267 END IDD_CORP_EXPIRYRECYCLING, DIALOG diff --git a/UserDlg.cpp b/UserDlg.cpp index f7f07a1..6a5851f 100644 --- a/UserDlg.cpp +++ b/UserDlg.cpp @@ -7573,6 +7573,12 @@ BOOL CUserDlg::ProcessSocket(Socket_Head_Add *pHead, BYTE *pFrame) str2.Format(_T("IP：%d->%d "), poldData->lSpeedLimit_IP, dlg.m_SettingsData.lSpeedLimit_IP); str += str2; } + //多运营商签名 + if (poldData->bMultCM != dlg.m_SettingsData.bMultCM) + { + str2.Format(_T("多签名：%d->%d "), poldData->bMultCM, dlg.m_SettingsData.bMultCM); + str += str2; + } REQ_Corp_CustomSettings* pSettings = new REQ_Corp_CustomSettings; memset(pSettings, 0, sizeof(REQ_Corp_CustomSettings)); @@ -8887,6 +8893,7 @@ void CUserDlg::On_User_Oper_CustomSettings() _tcscpy(pGet->szCorpName, pData->szCorpName); _tcscpy(pGet->szYWY , strYWYName); _tcscpy(pGet->szAgentName, strAgentName2); + _tcscpy(pGet->szSignature, pData->szCM); GetLocalTime(&pGet->tLocalTime); diff --git a/resource.h b/resource.h index 05dee37..b75457e 100644 --- a/resource.h +++ b/resource.h @@ -2079,9 +2079,14 @@ #define IDC_CORP_CUSTOM_SETTINGS_SPEEDLIMIT_IP 2413 #define IDC_CORP_CUSTOM_SETTINGS_AGENT_S 2414 #define IDC_CORP_EXPIRYRECYCLING_CORPID 2415 +#define IDC_CORP_CUSTOM_SETTINGS_MULTCM_ENABLE 2415 #define IDC_CORP_EXPIRYRECYCLING_CORPNAME 2416 +#define IDC_CORP_CUSTOM_SETTINGS_MULTCM_0 2416 #define IDC_CORP_EXPIRYRECYCLING_YWY 2417 +#define IDC_CORP_CUSTOM_SETTINGS_MULTCM_1 2417 #define IDC_CORP_EXPIRYRECYCLING_EXPRIY 2418 +#define IDC_CORP_CUSTOM_SETTINGS_MULTCM_2 2418 +#define IDC_CORP_CUSTOM_SETTINGS_MULTCM_3 2418 #define IDC_CORP_EXPIRYRECYCLING_BZ 2419 #define IDC_CORP_EXPIRYRECYCLING_SMSBALANCE 2420 #define IDC_CORP_EXPIRYRECYCLING_MMSBALANCE 2421 @@ -2154,7 +2159,6 @@ #define IDC_TDSET_SIGNATURE_MODIFY_BZ 2478 #define IDC_TDSET_SIGNATURE_MODIFY_TDTITLE 2479 #define IDC_TDSET_SIGNATURE_MODIFY_CONFLICT 2480 -#define IDC_TDSET_SIGNATURE_MODIFY_ERRDATA2 2481 #define IDC_TDSET_SIGNATURE_MODIFY_SENDCOUNT 2481 #define IDC_HANDCUR 3010 #define IDD_CORP_BZ 32260