mac ID and group id

xiemeng
1 parent 807fb556
Showing 6 changed files with 70 additions and 25 deletions
MTTTY.H
MTTTY.RC
MTTTY.vcproj
SETTINGS.C
TRANSFER.C
resource.h
--- a/MTTTY.H
View file @9916469
+++ b/MTTTY.H
View file @9916469
@@ -330,6 +330,7 @@ void ReportComStat( COMSTAT );
 void StatusMessage( void );
 void UpdateStatus( char * );
 void CheckComStat( BOOL );
+DWORD GetStartGroupID();
 //
 //  Writer heap functions
--- a/MTTTY.RC
View file @9916469
+++ b/MTTTY.RC
View file @9916469
@@ -22,13 +22,6 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 /////////////////////////////////////////////////////////////////////////////
 //
-// Accelerator
-//
-
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
 // Dialog
 //
@@ -51,10 +44,11 @@ STYLE DS_ABSALIGN | DS_SETFONT | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BO
 FONT 10, "??", 400, 0, 0x1
 BEGIN
     COMBOBOX        IDC_PORTCOMBO,2,0,48,51,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "连接夹具",IDC_BUTTON_CONNECT_UART,52,0,50,12
-    PUSHBUTTON      "软件路径",IDC_BUTTON2_SEC_BINFILE,109,0,50,12
+    PUSHBUTTON      "连接夹具",IDC_BUTTON_CONNECT_UART,52,0,36,12
+    PUSHBUTTON      "软件",IDC_BUTTON2_SEC_BINFILE,89,0,25,12
     PUSHBUTTON      "清除信息",IDC_BUTTON_CLEANINFO,176,0,50,12,NOT WS_VISIBLE
     EDITTEXT        IDC_STATIC_BINPATH,0,11,227,14,ES_AUTOHSCROLL | ES_READONLY
+    CONTROL         "写入Group ID",IDC_CHECK1_GROUP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,122,1,63,10
 END
 IDD_STATUSDIALOG DIALOGEX 0, 0, 392, 281
@@ -64,6 +58,17 @@ BEGIN
     EDITTEXT        IDC_STATUSEDIT,151,25,111,101,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL
 END
+IDD_GETADWORD DIALOGEX 0, 0, 121, 69
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Please Enter A Number"
+FONT 12, "MS Sans Serif", 400, 0, 0x0
+BEGIN
+    EDITTEXT        IDC_DWORDEDIT,34,26,52,14,ES_AUTOHSCROLL
+    DEFPUSHBUTTON   "OK",IDOK,16,49,40,14
+    PUSHBUTTON      "Cancel",IDCANCEL,64,49,40,14
+    LTEXT           "请输入起始Group ID",IDC_DWORDSTATIC,13,10,94,10
+END
+
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -77,20 +82,6 @@ IDI_APPICON2            ICON                    "MTTTY2.ICO"
 IDI_APPICON3            ICON                    "MTTTY3.ICO"
 IDI_APPICON4            ICON                    "MTTTY4.ICO"
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-//IDR_MTTTYMENU MENU 
-//BEGIN
-//    POPUP "T&ransfer"
-//    BEGIN
-//        MENUITEM "&Receive File (Text)...",     ID_TRANSFER_RECEIVEFILETEXT
-//    END
-//END
-
-
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -169,6 +160,11 @@ BEGIN
         RIGHTMARGIN, 224
         BOTTOMMARGIN, 1
     END
+
+    IDD_GETADWORD, DIALOG
+    BEGIN
+        BOTTOMMARGIN, 68
+    END
 END
 #endif    // APSTUDIO_INVOKED
--- a/MTTTY.vcproj
View file @9916469
+++ b/MTTTY.vcproj
View file @9916469
@@ -73,7 +73,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib comctl32.lib odbc32.lib odbccp32.lib"
+				AdditionalDependencies="winmm.lib comctl32.lib odbc32.lib odbccp32.lib shlwapi.lib"
 				OutputFile=".\WinRel/BlueFlashTool.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
--- a/SETTINGS.C
View file @9916469
+++ b/SETTINGS.C
View file @9916469
@@ -521,6 +521,7 @@ BOOL CALLBACK ToolbarProc(HWND hWndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     BOOL fRet = FALSE;
 	static char szFileName[MAX_PATH] = {0};
+	UINT mycheck_groupid;
     switch(uMsg)
     {
@@ -532,6 +533,18 @@ BOOL CALLBACK ToolbarProc(HWND hWndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 	    {
 		switch(LOWORD(wParam))
 		{
+		case IDC_CHECK1_GROUP:
+			mycheck_groupid = IsDlgButtonChecked(ghWndToolbarDlg, IDC_CHECK1_GROUP);
+			if (mycheck_groupid)
+			{
+				g_appdata.Groupid = GetStartGroupID();
+			}
+			else
+			{
+				g_appdata.Groupid = 0;
+			}
+			// CheckDlgButton( hDlg, IDC_LOCALECHOCHK, LOCALECHO( TTYInfo ) ) ;
+			break;
 		case IDC_BUTTON_CLEANINFO:
             ClearTTYContents();
             InvalidateRect(ghWndTTY, NULL, TRUE);
@@ -579,6 +592,7 @@ BOOL CALLBACK ToolbarProc(HWND hWndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 					}
 					CloseHandle(g_appdata.hFileOfEarphoneBin);
 					SetWindowText(GetDlgItem(hWndDlg, IDC_STATIC_BINPATH), g_appdata.szFileName);
+					ShowWindow(GetDlgItem(hWndDlg, IDC_BUTTON2_SEC_BINFILE),0);
 					SetWindowText(GetDlgItem(hWndDlg, IDC_BUTTON2_SEC_BINFILE), "下载软件");
 				}
 				if (g_appdata.DownloadReday == FALSE)
@@ -758,3 +772,28 @@ char GetHexControl(HWND hdlg, WORD wIdNumberBox, WORD wIdCharBox)
+BOOL CALLBACK GetADWORDProc(HWND hDlg, UINT uMessage, WPARAM wParam, LPARAM lParam)
+{
+    int iRet = 0;
+
+    if (uMessage == WM_COMMAND) {
+	switch(LOWORD(wParam)) {
+	    case IDOK:
+		iRet = GetDlgItemInt(hDlg, IDC_DWORDEDIT, NULL, FALSE);
+		//
+		// FALL THROUGH
+		// 
+	
+	    case IDCANCEL:
+		EndDialog(hDlg, iRet);          
+		return TRUE;
+	}
+    }
+
+    return FALSE;
+}
+
+DWORD GetStartGroupID()
+{
+    return ((DWORD) DialogBox(ghInst, MAKEINTRESOURCE(IDD_GETADWORD), ghwndMain, GetADWORDProc));
+}
--- a/TRANSFER.C
View file @9916469
+++ b/TRANSFER.C
View file @9916469
@@ -822,6 +822,10 @@ int fileCheck_fix_MACID( const char macid_sub[3])
 	FlushFileBuffers(g_appdata.hTempEarphoneBin);
 	Sleep(500);
 	CloseHandle(g_appdata.hTempEarphoneBin);
+	if (g_appdata.Groupid >0)
+	{
+		g_appdata.Groupid++;
+	}
 	g_appdata.hTempEarphoneBin = OpenTheFile(g_appdata.szFileName);
--- a/resource.h
View file @9916469
+++ b/resource.h
View file @9916469
@@ -12,6 +12,7 @@
 #define IDI_APPICON2                    109
 #define IDI_APPICON3                    110
 #define IDI_APPICON4                    111
+#define IDD_GETADWORD                   112
 #define IDC_PORTCOMBO                   1000
 #define IDC_BAUDCOMBO                   1001
 #define IDC_PARITYCOMBO                 1002
@@ -45,6 +46,8 @@
 #define IDC_NOWRITINGCHK                1077
 #define IDC_NOSTATUSCHK                 1078
 #define IDC_NOEVENTSCHK                 1079
+#define IDC_DWORDSTATIC                 1081
+#define IDC_DWORDEDIT                   1082
 #define IDC_BUTTON1                     1085
 #define IDC_BUTTON_CONNECT_UART         1085
 #define IDC_BUTTON2                     1086
@@ -53,6 +56,8 @@
 #define IDC_BUTTON_CLEANINFO            1087
 #define IDC_EDIT1                       1089
 #define IDC_STATIC_BINPATH              1089
+#define IDC_CHECK1                      1090
+#define IDC_CHECK1_GROUP                1090
 #define IDC_ABORTBTN                    1100
 #define IDC_TRANSFERPROGRESS            1200
 #define ID_TRANSFER_RECEIVEFILETEXT     40011
@@ -64,7 +69,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        113
 #define _APS_NEXT_COMMAND_VALUE         40021
-#define _APS_NEXT_CONTROL_VALUE         1090
+#define _APS_NEXT_CONTROL_VALUE         1091
 #define _APS_NEXT_SYMED_VALUE           104
 #endif
 #endif