diff --git a/DLG_User_Modify.cpp b/DLG_User_Modify.cpp index 8b5354e..f192367 100644 --- a/DLG_User_Modify.cpp +++ b/DLG_User_Modify.cpp @@ -20,6 +20,8 @@ DLG_User_Modify::DLG_User_Modify(CWnd* pParent /*=NULL*/) : CDialog(DLG_User_Modify::IDD, pParent) , m_bAllowRandSmsnum(FALSE) , m_bAllowExtend(FALSE) + , m_bProhibitNonTemplate(FALSE) + , m_bProhibitClient(FALSE) { //{{AFX_DATA_INIT(DLG_User_Modify) m_bGAddress_Add = FALSE; @@ -188,6 +190,8 @@ void DLG_User_Modify::DoDataExchange(CDataExchange* pDX) DDX_Check(pDX, IDC_USERMODIFY_ALLOWRANDSMSNUM, m_bAllowRandSmsnum); DDX_Control(pDX, IDC_USERMODIFY_CLEARPASSWD, m_B_ClearPasswd); DDX_Check(pDX, IDC_USERMODIFY_ALLOWEXTEND, m_bAllowExtend); + DDX_Check(pDX, IDC_USERMODIFY_SDK_PROHIBITNONTEMPLATE, m_bProhibitNonTemplate); + DDX_Check(pDX, IDC_USERMODIFY_SDK_PROHIBITCLIENT, m_bProhibitClient); } @@ -268,6 +272,8 @@ BOOL DLG_User_Modify::OnInitDialog() m_lPurviewType = m_Address.ulPurviewType; m_bSDK = m_Address.bSDK & SDK_SDK ? true:false; + m_bProhibitNonTemplate = m_Address.bSDK & SDK_PROHIBITNONTEMPLATE ? true : false; + m_bProhibitClient = m_Address.bSDK & SDK_PROHIBITCLIENT ? true : false; m_bAutoReg = m_Address.bSDK & SDK_AUTOREG ? true:false; m_bAutoQuery = m_Address.bSDK & SDK_AUTOQUERY ? true:false; m_bAword = m_Address.bSDK & SDK_AWORD ? true:false; @@ -1022,6 +1028,11 @@ void DLG_User_Modify::OnBnClickedOk() m_Address.bSDK = 0; if ( m_bSDK ) m_Address.bSDK |= SDK_SDK; + if (m_bProhibitNonTemplate) + m_Address.bSDK |= SDK_PROHIBITNONTEMPLATE; + if (m_bProhibitClient) + m_Address.bSDK |= SDK_PROHIBITCLIENT; + if ( m_bAutoReg ) m_Address.bSDK |= SDK_AUTOREG; if ( m_bAutoQuery ) diff --git a/DLG_User_Modify.h b/DLG_User_Modify.h index 22273dd..1b586e0 100644 --- a/DLG_User_Modify.h +++ b/DLG_User_Modify.h @@ -142,6 +142,8 @@ public: afx_msg void OnBnClickedUsermodifyClearpasswd(); CButton m_B_ClearPasswd; BOOL m_bAllowExtend; + BOOL m_bProhibitNonTemplate; + BOOL m_bProhibitClient; }; //{{AFX_INSERT_LOCATION}} diff --git a/Debug_Unicode/SmsManager.exe b/Debug_Unicode/SmsManager.exe index 2240901..86b5ce5 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 66d8d89..cf43ab5 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 a35d5e6..99c1213 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/link.read.1.tlog b/Debug_Unicode/SmsManager.tlog/link.read.1.tlog index 9d3c8da..c3ccc86 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 2c71b05..db5758a 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 430c078..d5af701 100644 Binary files a/Debug_Unicode/vc143.idb and b/Debug_Unicode/vc143.idb differ diff --git a/Doc/么么哒导入.xls b/Doc/么么哒导入.xls new file mode 100644 index 0000000..c5d31e7 Binary files /dev/null and b/Doc/么么哒导入.xls differ diff --git a/Release_Unicode/SmsManager.res b/Release_Unicode/SmsManager.res index dc0e863..4cceb48 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 39ba09b..25dcc46 100644 Binary files a/Release_Unicode/SmsManager3.exe and b/Release_Unicode/SmsManager3.exe differ diff --git a/SmsManager.rc b/SmsManager.rc index 8f79719..9ddc706 100644 --- a/SmsManager.rc +++ b/SmsManager.rc @@ -1881,8 +1881,21 @@ BEGIN PUSHBUTTON "¸ß¼¶ >>",IDC_USERMODIFY_PURVIEWGJ,275,7,40,19 CONTROL "¶þ´Î¿ª·¢½Ó¿Ú",IDC_USERMODIFY_SDK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,254,33,61,10 EDITTEXT IDC_USERMODIFY_IP,271,47,64,12,ES_AUTOHSCROLL - CONTROL "»áÔ±×Ô¶¯×¢²á",IDC_USERMODIFY_AUTOREG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,254,67,61,10 - CONTROL "×Ô¶¯²éѯ»Ø¸´",IDC_USERMODIFY_AUTOQUERY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,254,81,61,10 + CONTROL "½ûÓ÷ÇÄ£°å¶ÌÐÅ",IDC_USERMODIFY_SDK_PROHIBITNONTEMPLATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,260,61,66,10 + CONTROL "½ûÓÿͻ§¶Ë·¢ËÍ",IDC_USERMODIFY_SDK_PROHIBITCLIENT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,260,72,66,10 + CONTROL "»áÔ±×Ô¶¯×¢²á",IDC_USERMODIFY_AUTOREG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,254,85,61,10 + CONTROL "×Ô¶¯²éѯ»Ø¸´",IDC_USERMODIFY_AUTOQUERY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,254,96,61,10 + CONTROL "³é½±ÏµÍ³",IDC_USERMODIFY_AWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,254,107,46,10 + CONTROL "¶ÌÐÅÉÌÎñͨ",IDC_USERMODIFY_SWT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,254,118,53,10 + CONTROL "RTX¶ÌÐÅÍø¹Ø",IDC_USERMODIFY_RTX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,254,129,58,10 + CONTROL "¼«ËÙ·¢",IDC_USERMODIFY_SMSEXPRESS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,254,140,38,10 + CONTROL "¶ÌÐÅͨ",IDC_USERMODIFY_DXT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,254,151,38,10 + CONTROL "¿Í·þÒ×",IDC_USERMODIFY_UBOX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,254,162,38,10 + CONTROL "ÔÊÐíÉèÖÃÈճ̺ÅÂë",IDC_USERMODIFY_ALLOWSETMOBILE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,254,189,75,10 + CONTROL "ÔÊÐí×ÔÐиü¸ÄͨµÀ",IDC_USERMODIFY_ALLOWCHANGETD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,254,200,75,10 + CONTROL "ÔÊÐí²éѯʧ°Ü¶ÌÐÅ",IDC_USERMODIFY_ALLOWFINDFAIL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,254,211,75,10 + CONTROL "ÔÊÐíÀ©Õ¹×Ӷ˿ںÅ",IDC_USERMODIFY_ALLOWEXTEND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,254,222,75,10 + CONTROL "ÔÊÐíËæ»ú×Ӷ˿ںÅ",IDC_USERMODIFY_ALLOWRANDSMSNUM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,254,233,75,10 DEFPUSHBUTTON "È· ¶¨",IDOK,255,250,39,19 PUSHBUTTON "È¡ Ïû",IDCANCEL,298,250,39,19 CONTROL "ÔÊÐíµÇ¼",IDC_USERMODIFY_BLOGIN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,349,18,46,10 @@ -1939,21 +1952,10 @@ BEGIN CONTROL "Ç¿ÖÆÒþ²ØÊÖ»úºÅÂë",IDC_USERMODIFY_HIDENUM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,349,217,75,10 LTEXT "IP",IDC_STATIC,260,49,9,8 LTEXT "Ç¿Ç©Ãû",IDC_STATIC,14,179,23,8 - CONTROL "³é½±ÏµÍ³",IDC_USERMODIFY_AWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,254,94,46,10 - CONTROL "¶ÌÐÅÉÌÎñͨ",IDC_USERMODIFY_SWT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,254,107,53,10 LTEXT "Ìá½»ËÙ¶È",IDC_STATIC,132,114,31,8 - CONTROL "ÔÊÐíÉèÖÃÈճ̺ÅÂë",IDC_USERMODIFY_ALLOWSETMOBILE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,254,189,75,10 - CONTROL "RTX¶ÌÐÅÍø¹Ø",IDC_USERMODIFY_RTX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,254,118,58,10 - CONTROL "¼«ËÙ·¢",IDC_USERMODIFY_SMSEXPRESS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,254,130,38,10 - CONTROL "ÔÊÐí×ÔÐиü¸ÄͨµÀ",IDC_USERMODIFY_ALLOWCHANGETD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,254,201,75,10 - CONTROL "ÔÊÐí²éѯʧ°Ü¶ÌÐÅ",IDC_USERMODIFY_ALLOWFINDFAIL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,254,212,75,10 - CONTROL "ÔÊÐíÀ©Õ¹×Ӷ˿ںÅ",IDC_USERMODIFY_ALLOWEXTEND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,254,222,75,10 - CONTROL "ÔÊÐíËæ»ú×Ӷ˿ںÅ",IDC_USERMODIFY_ALLOWRANDSMSNUM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,254,233,75,10 - CONTROL "¶ÌÐÅͨ",IDC_USERMODIFY_DXT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,254,143,38,10 CONTROL "ÔÊÐíÅúÁ¿ÈÎÎñ",IDC_USERMODIFY_PL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,349,230,61,10 COMBOBOX IDC_USERMODIFY_MMSUSED,161,95,71,170,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP LTEXT "²ÊÐÅÁ¿",IDC_STATIC,133,97,23,8 - CONTROL "¿Í·þÒ×",IDC_USERMODIFY_UBOX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,254,155,38,10 CONTROL "ÉóºËÕß",IDC_USERMODIFY_PL_VERIFY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,455,230,38,10 CONTROL "ÐèÉóºË",IDC_USERMODIFY_PL_AUDIT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,413,230,38,10 PUSHBUTTON "Çå¿Õ",IDC_USERMODIFY_CLEARPASSWD,206,48,26,16 @@ -4950,7 +4952,7 @@ BEGIN COMBOBOX IDC_CORP_ANALYSE_QUERYALL,404,34,64,187,CBS_DROPDOWNLIST | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP END -IDD_K_GZMSG_JL DIALOGEX 0, 0, 397, 288 +IDD_K_GZMSG_JL DIALOGEX 0, 0, 397, 321 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "¼¤ÀøÆÀ±È½á¹û" FONT 8, "MS Shell Dlg", 400, 0, 0x1 @@ -4967,8 +4969,8 @@ BEGIN LTEXT "ÌôÕ½±ÈÀý",IDD_K_GZMSG_JL_PKRATIO_S,231,38,29,8 COMBOBOX IDD_K_GZMSG_JL_PKRATIO,267,37,35,132,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "²éѯÆÀ±È½á¹û",IDD_K_GZMSG_JL_QUERY,238,15,65,17 - GROUPBOX "½á¹û",IDC_STATIC,7,62,383,220 - CONTROL "",IDC_GZMSG_JL_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | WS_TABSTOP,13,74,370,198 + GROUPBOX "½á¹û",IDC_STATIC,7,62,383,252 + CONTROL "",IDC_GZMSG_JL_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | WS_TABSTOP,13,74,370,234 PUSHBUTTON "µ¼ÈëôôßÕÊý¾Ý",IDD_K_GZMSG_JL_INPORTMMDCOUNT,313,15,65,17 CONTROL "±¨±íģʽ",IDD_K_GZMSG_JL_ADDLIST,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,314,38,44,10 END @@ -6895,7 +6897,7 @@ BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 390 TOPMARGIN, 7 - BOTTOMMARGIN, 281 + BOTTOMMARGIN, 314 END IDD_C_FPQUERY, DIALOG diff --git a/resource.h b/resource.h index 87310f4..22cce73 100644 --- a/resource.h +++ b/resource.h @@ -347,8 +347,11 @@ #define IDC_USERMODIFY_SDK 1150 #define IDD_OTHER_AUTOSEND_MOBILE 1151 #define IDC_CORP_MODIFY_EMAIL4 1151 +#define IDC_USERMODIFY_SDK_PROHIBITNONTEMPLATE 1151 #define IDC_CORP_LXRMODIFY_SEX 1152 #define IDD_OTHER_AUTOSEND_OVERDATE 1152 +#define IDC_USERMODIFY_SDK_PROHIBITDXY 1152 +#define IDC_USERMODIFY_SDK_PROHIBITCLIENT 1152 #define IDC_CORP_MODIFY_MOBILE2 1153 #define IDC_CORP_LXRMODIFY_ZJTYPE 1153 #define IDD_OTHER_AUTOSEND_SETPASSWD 1153