Commit 04517dfb160cbec61a68ef45736aacd72678c021

Authored by xiemeng
1 parent d662c673

xiemeng update

Signed-off-by: xiemeng <xm@topwelltec.com>
@@ -21,6 +21,7 @@ @@ -21,6 +21,7 @@
21 extern CSNWriterDlg *g_pMainDlg; 21 extern CSNWriterDlg *g_pMainDlg;
22 extern byte g_QC_value_from_phone;// 从手机中读到的QC值 22 extern byte g_QC_value_from_phone;// 从手机中读到的QC值
23 23
  24 +
24 static const GUID GUID_PORT_CLASS_USB2SER = {0x4D36E978L, 0xE325, 0x11CE, {0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18}}; 25 static const GUID GUID_PORT_CLASS_USB2SER = {0x4D36E978L, 0xE325, 0x11CE, {0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18}};
25 26
26 void __stdcall CNF_SPReadFromNVRAM(const SPMETA_DLL::FT_NVRAM_READ_CNF *cnf, const short token, void *usrData) 27 void __stdcall CNF_SPReadFromNVRAM(const SPMETA_DLL::FT_NVRAM_READ_CNF *cnf, const short token, void *usrData)
@@ -4372,47 +4373,50 @@ void SmartPhoneSN::ThreadMainEntryPoint() @@ -4372,47 +4373,50 @@ void SmartPhoneSN::ThreadMainEntryPoint()
4372 } 4373 }
4373 MTRACE (g_hEBOOT_DEBUG, "SmartPhoneSN::GetSPModemInfo_Ex(): Query modem information end."); 4374 MTRACE (g_hEBOOT_DEBUG, "SmartPhoneSN::GetSPModemInfo_Ex(): Query modem information end.");
4374 } 4375 }
4375 -  
4376 -  
4377 -#ifdef __TOPWELL_QCTEST__  
4378 - SPMETA_DLL::SP_META_GetTargetVerInfoV2_r(m_hSPMetaHandle, &a_v2cnf, &a_token,NULL);  
4379 - {  
4380 - UpdateUIMsg("读取到版本信息");  
4381 -  
4382 - if (strcmp(a_v2cnf.BUILD_DISP_ID,g_sMetaComm.check_sw_ver) != 0 ) 4376 + #ifdef __TOPWELL_QCTEST__
  4377 + SPMETA_DLL::SP_META_GetTargetVerInfoV2_r(m_hSPMetaHandle, &a_v2cnf, &a_token,NULL);
4383 { 4378 {
4384 - bAnyOperationFail = true;  
4385 - UpdateUIMsg("Version number is wrong");  
4386 - goto End; 4379 + UpdateUIMsg("读取到版本信息");
  4380 + int len=strlen(g_sMetaComm.check_sw_ver);
  4381 +
  4382 + /* strcpy(tmp_checkSwVer,g_sMetaComm.check_sw_ver);
  4383 +
  4384 + tmp_checkSwVer[len]=10;
  4385 + tmp_checkSwVer[len+1]='\0';*/
  4386 +
  4387 + if (strncmp(a_v2cnf.BUILD_DISP_ID,g_sMetaComm.check_sw_ver,len) != 0 )
  4388 + {
  4389 + bAnyOperationFail = true;
  4390 + UpdateUIMsg("Version number is wrong");
  4391 + goto End;
  4392 + }
  4393 + else
  4394 + {
  4395 + UpdateUIMsg("Version number OK!");
  4396 + }
4387 } 4397 }
4388 - else 4398 + if (g_sMetaComm.bCheckQCFlag)
4389 { 4399 {
4390 - UpdateUIMsg("Version number OK!"); 4400 + g_QC_value_from_phone = REQ_ReadAP_NVRAM_QC();
  4401 + switch(g_QC_value_from_phone)
  4402 + {
  4403 + case 0:
  4404 + bAnyOperationFail = true;
  4405 + UpdateUIMsg("QC untest");
  4406 + goto End;
  4407 + break;
  4408 + case 1:
  4409 + UpdateUIMsg("QC test pass");
  4410 + break;
  4411 + default:
  4412 + bAnyOperationFail = true;
  4413 + UpdateUIMsg("QC test fail");
  4414 + goto End;
  4415 + break;
  4416 + }
4391 } 4417 }
4392 -  
4393 - }  
4394 - if (g_sMetaComm.bCheckQCFlag)  
4395 - {  
4396 - g_QC_value_from_phone = REQ_ReadAP_NVRAM_QC();  
4397 - switch(g_QC_value_from_phone)  
4398 - {  
4399 - case 0:  
4400 - bAnyOperationFail = true;  
4401 - UpdateUIMsg("QC untest");  
4402 - goto End;  
4403 - break;  
4404 - case 1:  
4405 - UpdateUIMsg("QC test pass");  
4406 - break;  
4407 - default:  
4408 - bAnyOperationFail = true;  
4409 - UpdateUIMsg("QC test fail");  
4410 - goto End;  
4411 - break;  
4412 - }  
4413 - }  
4414 -#endif  
4415 - 4418 + #endif
  4419 +
4416 //Special case: m_bWriteModemNvram = true && m_sMdInfo.number_of_md = 0 4420 //Special case: m_bWriteModemNvram = true && m_sMdInfo.number_of_md = 0
4417 //So skip to load modem database 4421 //So skip to load modem database
4418 MTRACE (g_hEBOOT_DEBUG, "m_bWriteModemNvram = %d,m_sMdInfo.number_of_md = %d", m_bWriteModemNvram, m_sMdInfo.number_of_md); 4422 MTRACE (g_hEBOOT_DEBUG, "m_bWriteModemNvram = %d,m_sMdInfo.number_of_md = %d", m_bWriteModemNvram, m_sMdInfo.number_of_md);
@@ -901,12 +901,21 @@ BOOL CSystemConfig::DestroyWindow() @@ -901,12 +901,21 @@ BOOL CSystemConfig::DestroyWindow()
901 void CSystemConfig::OnBtnSave() 901 void CSystemConfig::OnBtnSave()
902 { 902 {
903 g_sMetaComm.sIMEIOption.bLockOtp = ((CButton *)GetDlgItem(IDC_LOCK_OTP))->GetCheck() == BST_CHECKED; 903 g_sMetaComm.sIMEIOption.bLockOtp = ((CButton *)GetDlgItem(IDC_LOCK_OTP))->GetCheck() == BST_CHECKED;
  904 +
  905 +
  906 +#if 0
  907 + if (myswversion.IsEmpty() || (myswversion.Compare("null")==0))
  908 + {
  909 + MessageBox("please input SW version!!");
  910 + }
  911 +#endif
904 912
  913 +#if 0
905 if (myswversion == "null" ||myswversion == "") 914 if (myswversion == "null" ||myswversion == "")
906 { 915 {
907 MessageBox("please input SW version!!"); 916 MessageBox("please input SW version!!");
908 } 917 }
909 - 918 +#endif
910 919
911 CDialog::OnOK(); 920 CDialog::OnOK();
912 } 921 }
@@ -14,13 +14,10 @@ @@ -14,13 +14,10 @@
14 #define IDD_IDENTIFY_VERIFY_DIALOG 142 14 #define IDD_IDENTIFY_VERIFY_DIALOG 142
15 #define IDD_CHANGE_PASSWD_DIALOG 143 15 #define IDD_CHANGE_PASSWD_DIALOG 143
16 #define IDD_FILE_LOAD_DIALOG 144 16 #define IDD_FILE_LOAD_DIALOG 144
17 -#define IDD_DIALOG1 145  
18 #define IDD_AUTOGEN_DIALOG 146 17 #define IDD_AUTOGEN_DIALOG 146
19 #define IDB_BITMAP_LOGO 148 18 #define IDB_BITMAP_LOGO 148
20 #define IDI_ICON1 154 19 #define IDI_ICON1 154
21 #define IDD_ENCRYPTION_DIALOG 155 20 #define IDD_ENCRYPTION_DIALOG 155
22 -#define IDD_CHECK_WORKMODE 157  
23 -#define IDD_DIALOG_DB_CHOOSE 160  
24 #define IDC_COUNT_TOTAL 1000 21 #define IDC_COUNT_TOTAL 1000
25 #define IDC_BTN_SYSCONFIG 1001 22 #define IDC_BTN_SYSCONFIG 1001
26 #define IDC_BTN_START 1002 23 #define IDC_BTN_START 1002
@@ -196,9 +193,7 @@ @@ -196,9 +193,7 @@
196 #define IDC_STR_SWVERSION 1167 193 #define IDC_STR_SWVERSION 1167
197 #define IDC_STATIC_SWVER 1169 194 #define IDC_STATIC_SWVER 1169
198 #define IDC_COMBO2 1172 195 #define IDC_COMBO2 1172
199 -#define IDC_EDIT1_AP_PATH 1173  
200 #define IDC_BUTTONAP 1174 196 #define IDC_BUTTONAP 1174
201 -#define IDC_EDIT1_BP_PATH 1175  
202 #define IDC_BUTTONBP 1176 197 #define IDC_BUTTONBP 1176
203 #define IDR_OPTION_SWITCHTOOL 32772 198 #define IDR_OPTION_SWITCHTOOL 32772
204 #define IDR_OPTION_EXTMODEM 32773 199 #define IDR_OPTION_EXTMODEM 32773
@@ -234,10 +234,6 @@ SOURCE=.\Extra\CBtnST\ShadeButtonST.cpp @@ -234,10 +234,6 @@ SOURCE=.\Extra\CBtnST\ShadeButtonST.cpp
234 # End Group 234 # End Group
235 # Begin Source File 235 # Begin Source File
236 236
237 -SOURCE=.\chooseworkmode.cpp  
238 -# End Source File  
239 -# Begin Source File  
240 -  
241 SOURCE=.\Encryption.cpp 237 SOURCE=.\Encryption.cpp
242 # End Source File 238 # End Source File
243 # Begin Source File 239 # Begin Source File
@@ -511,10 +507,6 @@ SOURCE=.\Extra\CBtnST\ShadeButtonST.h @@ -511,10 +507,6 @@ SOURCE=.\Extra\CBtnST\ShadeButtonST.h
511 # End Group 507 # End Group
512 # Begin Source File 508 # Begin Source File
513 509
514 -SOURCE=.\chooseworkmode.h  
515 -# End Source File  
516 -# Begin Source File  
517 -  
518 SOURCE=.\Encryption.h 510 SOURCE=.\Encryption.h
519 # End Source File 511 # End Source File
520 # Begin Source File 512 # Begin Source File
@@ -13,92 +13,6 @@ @@ -13,92 +13,6 @@
13 #undef APSTUDIO_READONLY_SYMBOLS 13 #undef APSTUDIO_READONLY_SYMBOLS
14 14
15 ///////////////////////////////////////////////////////////////////////////// 15 /////////////////////////////////////////////////////////////////////////////
16 -// Chinese (P.R.C.) resources  
17 -  
18 -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHS)  
19 -#ifdef _WIN32  
20 -LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED  
21 -#pragma code_page(936)  
22 -#endif //_WIN32  
23 -  
24 -/////////////////////////////////////////////////////////////////////////////  
25 -//  
26 -// Dialog  
27 -//  
28 -  
29 -IDD_CHECK_WORKMODE DIALOG DISCARDABLE 0, 0, 145, 70  
30 -STYLE DS_MODALFRAME | WS_POPUP  
31 -FONT 14, "΢ÈíÑźÚ"  
32 -BEGIN  
33 - DEFPUSHBUTTON "OK",IDOK,15,43,50,14  
34 - PUSHBUTTON "Cancel",IDCANCEL,79,43,50,14  
35 - COMBOBOX IDC_COMBO2,24,18,97,76,CBS_DROPDOWNLIST | WS_VSCROLL |  
36 - WS_TABSTOP  
37 - LTEXT "please choose work station",IDC_STATIC,26,5,92,8  
38 -END  
39 -  
40 -IDD_DIALOG_DB_CHOOSE DIALOG DISCARDABLE 0, 0, 292, 88  
41 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU  
42 -CAPTION "choose DB file"  
43 -FONT 10, "΢ÈíÑźÚ"  
44 -BEGIN  
45 - DEFPUSHBUTTON "OK",IDOK,83,65,50,14  
46 - PUSHBUTTON "Cancel",IDCANCEL,158,65,50,14  
47 - EDITTEXT IDC_EDIT1_AP_PATH,10,16,204,14,ES_AUTOHSCROLL  
48 - PUSHBUTTON "AP file",IDC_BUTTONAP,225,16,50,14  
49 - EDITTEXT IDC_EDIT1_BP_PATH,10,33,204,14,ES_AUTOHSCROLL  
50 - PUSHBUTTON "BP file",IDC_BUTTONBP,225,33,50,14  
51 -END  
52 -  
53 -  
54 -/////////////////////////////////////////////////////////////////////////////  
55 -//  
56 -// DESIGNINFO  
57 -//  
58 -  
59 -#ifdef APSTUDIO_INVOKED  
60 -GUIDELINES DESIGNINFO DISCARDABLE  
61 -BEGIN  
62 - IDD_CHECK_WORKMODE, DIALOG  
63 - BEGIN  
64 - LEFTMARGIN, 7  
65 - RIGHTMARGIN, 138  
66 - TOPMARGIN, 7  
67 - BOTTOMMARGIN, 63  
68 - END  
69 -  
70 - IDD_DIALOG_DB_CHOOSE, DIALOG  
71 - BEGIN  
72 - LEFTMARGIN, 7  
73 - RIGHTMARGIN, 285  
74 - TOPMARGIN, 7  
75 - BOTTOMMARGIN, 81  
76 - END  
77 -END  
78 -#endif // APSTUDIO_INVOKED  
79 -  
80 -  
81 -/////////////////////////////////////////////////////////////////////////////  
82 -//  
83 -// Dialog Info  
84 -//  
85 -  
86 -IDD_CHECK_WORKMODE DLGINIT  
87 -BEGIN  
88 - IDC_COMBO2, 0x403, 11, 0  
89 -0x7277, 0x7469, 0x2065, 0x6d69, 0x6965, "\000"  
90 - IDC_COMBO2, 0x403, 11, 0  
91 -0x6863, 0x6365, 0x206b, 0x6d69, 0x6965, "\000"  
92 - IDC_COMBO2, 0x403, 10, 0  
93 -0x6863, 0x6365, 0x206b, 0x6c61, 0x006c,  
94 - 0  
95 -END  
96 -  
97 -#endif // Chinese (P.R.C.) resources  
98 -/////////////////////////////////////////////////////////////////////////////  
99 -  
100 -  
101 -/////////////////////////////////////////////////////////////////////////////  
102 // English (U.S.) resources 16 // English (U.S.) resources
103 17
104 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) 18 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
@@ -107,124 +21,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US @@ -107,124 +21,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
107 #pragma code_page(1252) 21 #pragma code_page(1252)
108 #endif //_WIN32 22 #endif //_WIN32
109 23
110 -#ifdef APSTUDIO_INVOKED  
111 -/////////////////////////////////////////////////////////////////////////////  
112 -//  
113 -// TEXTINCLUDE  
114 -//  
115 -  
116 -1 TEXTINCLUDE MOVEABLE PURE  
117 -BEGIN  
118 - "resource.h\0"  
119 -END  
120 -  
121 -2 TEXTINCLUDE MOVEABLE PURE  
122 -BEGIN  
123 - "#include ""afxres.h""\r\n"  
124 - "\0"  
125 -END  
126 -  
127 -3 TEXTINCLUDE MOVEABLE PURE  
128 -BEGIN  
129 - "#define _AFX_NO_SPLITTER_RESOURCES\r\n"  
130 - "#define _AFX_NO_OLE_RESOURCES\r\n"  
131 - "#define _AFX_NO_TRACKER_RESOURCES\r\n"  
132 - "#define _AFX_NO_PROPERTY_RESOURCES\r\n"  
133 - "\r\n"  
134 - "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"  
135 - "#ifdef _WIN32\r\n"  
136 - "LANGUAGE 9, 1\r\n"  
137 - "#pragma code_page(1252)\r\n"  
138 - "#endif //_WIN32\r\n"  
139 - "#include ""afxres.rc"" // Standard components\r\n"  
140 - "#endif\r\n"  
141 - "\0"  
142 -END  
143 -  
144 -#endif // APSTUDIO_INVOKED  
145 -  
146 -  
147 -/////////////////////////////////////////////////////////////////////////////  
148 -//  
149 -// Icon  
150 -//  
151 -  
152 -// Icon with lowest ID value placed first to ensure application icon  
153 -// remains consistent on all systems.  
154 -IDR_MAINFRAME ICON DISCARDABLE "res\\SN Writer.ico"  
155 -  
156 -/////////////////////////////////////////////////////////////////////////////  
157 -//  
158 -// Bitmap  
159 -//  
160 -  
161 -IDB_BITMAP_FAIL BITMAP MOVEABLE PURE "res\\FAIL.bmp"  
162 -IDB_BITMAP_PASS BITMAP MOVEABLE PURE "res\\PASS.bmp"  
163 -  
164 -/////////////////////////////////////////////////////////////////////////////  
165 -//  
166 -// Menu  
167 -//  
168 -  
169 -IDR_SN_MENU MENU DISCARDABLE  
170 -BEGIN  
171 - POPUP "&File"  
172 - BEGIN  
173 - MENUITEM "FP Auth file", IDR_FP_AUTH_FILE  
174 - MENUITEM "SP Auth file", IDR_SP_AUTH_FILE  
175 - END  
176 - POPUP "&Option"  
177 - BEGIN  
178 - MENUITEM "&Already in Meta Mode", IDR_OPTION_ALREADYINMETA  
179 - POPUP "Operate Mode"  
180 - BEGIN  
181 - MENUITEM "Meta Mode", IDR_META_MODE  
182 - MENUITEM "AT Mode", IDR_ATCMD_MODE  
183 - END  
184 - MENUITEM "USB Switch Tool", IDR_OPTION_SWITCHTOOL  
185 - MENUITEM "External Modem", IDR_OPTION_EXTMODEM  
186 - MENUITEM "Security USB", IDR_OPTION_SECURITY_USB  
187 - MENUITEM "Usb Without Battery", IDR_OPTION_USB_WITHOUT_BATTERY  
188 -  
189 - POPUP "Check Flag"  
190 - BEGIN  
191 - MENUITEM "Check Calibration Flag", IDR_OPTION_CHECK_CAL_FLAG  
192 -  
193 - MENUITEM "Check NSFT Flag", IDR_OPTION_CHECK_FT_FLAG  
194 - END  
195 - MENUITEM "Skip Write ProInfo", IDR_OPTION_SKIP_WRITE_PRODINFO  
196 -  
197 - MENUITEM "&Composite Device (Adb)", IDR_OPTION_COMPOSITE_DEVICE  
198 - MENUITEM "&Backup Nvram to PC", IDR_BACKNV_TOPC  
199 - MENUITEM "Fastboot Oem Lock", IDR_OEM_LOCK  
200 - END  
201 - POPUP "Hdcp_DRMKey"  
202 - BEGIN  
203 - MENUITEM "8389+8193Hdcp Key ", IDR_OPTION_HDCP  
204 - MENUITEM "MTK HDCP/DRM Key", IDR_OPTION_DRMKEY  
205 - MENUITEM "Hdcp Data", IDR_OPTION_HDCPDATA  
206 - END  
207 - POPUP "Identify"  
208 - BEGIN  
209 - POPUP "Engineer"  
210 - BEGIN  
211 - MENUITEM "Switch to Operator", IDR_ENG_TO_OPERATER  
212 - MENUITEM "Change Passwd", IDR_CHANGE_PASSWD  
213 - MENUITEM "Enable AutoGen", IDR_ENABLE_AUTOGEN  
214 - MENUITEM "Enable Check BtWifi", IDR_CHECK_BTWIFI  
215 - END  
216 - POPUP "Operator"  
217 - BEGIN  
218 - MENUITEM "Switch To Engineer", IDR_OPERATOR_TO_ENG  
219 - END  
220 - END  
221 - POPUP "&Help"  
222 - BEGIN  
223 - MENUITEM "&About", IDR_ABOUT_SN  
224 - END  
225 -END  
226 -  
227 -  
228 ///////////////////////////////////////////////////////////////////////////// 24 /////////////////////////////////////////////////////////////////////////////
229 // 25 //
230 // Dialog 26 // Dialog
@@ -361,7 +157,7 @@ STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | @@ -361,7 +157,7 @@ STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION |
361 WS_SYSMENU 157 WS_SYSMENU
362 EXSTYLE WS_EX_APPWINDOW 158 EXSTYLE WS_EX_APPWINDOW
363 CAPTION "SN Writer" 159 CAPTION "SN Writer"
364 -FONT 10, "System" 160 +FONT 10, "System", 0, 0, 0x1
365 BEGIN 161 BEGIN
366 LTEXT "ComPort:",IDC_STATIC,13,22,43,9,0,WS_EX_RIGHT 162 LTEXT "ComPort:",IDC_STATIC,13,22,43,9,0,WS_EX_RIGHT
367 EDITTEXT IDC_COUNT_TOTAL,213,18,100,13,ES_AUTOHSCROLL | 163 EDITTEXT IDC_COUNT_TOTAL,213,18,100,13,ES_AUTOHSCROLL |
@@ -681,6 +477,124 @@ END @@ -681,6 +477,124 @@ END
681 #endif // APSTUDIO_INVOKED 477 #endif // APSTUDIO_INVOKED
682 478
683 479
  480 +#ifdef APSTUDIO_INVOKED
  481 +/////////////////////////////////////////////////////////////////////////////
  482 +//
  483 +// TEXTINCLUDE
  484 +//
  485 +
  486 +1 TEXTINCLUDE MOVEABLE PURE
  487 +BEGIN
  488 + "resource.h\0"
  489 +END
  490 +
  491 +2 TEXTINCLUDE MOVEABLE PURE
  492 +BEGIN
  493 + "#include ""afxres.h""\r\n"
  494 + "\0"
  495 +END
  496 +
  497 +3 TEXTINCLUDE MOVEABLE PURE
  498 +BEGIN
  499 + "#define _AFX_NO_SPLITTER_RESOURCES\r\n"
  500 + "#define _AFX_NO_OLE_RESOURCES\r\n"
  501 + "#define _AFX_NO_TRACKER_RESOURCES\r\n"
  502 + "#define _AFX_NO_PROPERTY_RESOURCES\r\n"
  503 + "\r\n"
  504 + "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"
  505 + "#ifdef _WIN32\r\n"
  506 + "LANGUAGE 9, 1\r\n"
  507 + "#pragma code_page(1252)\r\n"
  508 + "#endif //_WIN32\r\n"
  509 + "#include ""afxres.rc"" // Standard components\r\n"
  510 + "#endif\r\n"
  511 + "\0"
  512 +END
  513 +
  514 +#endif // APSTUDIO_INVOKED
  515 +
  516 +
  517 +/////////////////////////////////////////////////////////////////////////////
  518 +//
  519 +// Icon
  520 +//
  521 +
  522 +// Icon with lowest ID value placed first to ensure application icon
  523 +// remains consistent on all systems.
  524 +IDR_MAINFRAME ICON DISCARDABLE "res\\SN Writer.ico"
  525 +
  526 +/////////////////////////////////////////////////////////////////////////////
  527 +//
  528 +// Bitmap
  529 +//
  530 +
  531 +IDB_BITMAP_FAIL BITMAP MOVEABLE PURE "res\\FAIL.bmp"
  532 +IDB_BITMAP_PASS BITMAP MOVEABLE PURE "res\\PASS.bmp"
  533 +
  534 +/////////////////////////////////////////////////////////////////////////////
  535 +//
  536 +// Menu
  537 +//
  538 +
  539 +IDR_SN_MENU MENU DISCARDABLE
  540 +BEGIN
  541 + POPUP "&File"
  542 + BEGIN
  543 + MENUITEM "FP Auth file", IDR_FP_AUTH_FILE
  544 + MENUITEM "SP Auth file", IDR_SP_AUTH_FILE
  545 + END
  546 + POPUP "&Option"
  547 + BEGIN
  548 + MENUITEM "&Already in Meta Mode", IDR_OPTION_ALREADYINMETA
  549 + POPUP "Operate Mode"
  550 + BEGIN
  551 + MENUITEM "Meta Mode", IDR_META_MODE
  552 + MENUITEM "AT Mode", IDR_ATCMD_MODE
  553 + END
  554 + MENUITEM "USB Switch Tool", IDR_OPTION_SWITCHTOOL
  555 + MENUITEM "External Modem", IDR_OPTION_EXTMODEM
  556 + MENUITEM "Security USB", IDR_OPTION_SECURITY_USB
  557 + MENUITEM "Usb Without Battery", IDR_OPTION_USB_WITHOUT_BATTERY
  558 +
  559 + POPUP "Check Flag"
  560 + BEGIN
  561 + MENUITEM "Check Calibration Flag", IDR_OPTION_CHECK_CAL_FLAG
  562 +
  563 + MENUITEM "Check NSFT Flag", IDR_OPTION_CHECK_FT_FLAG
  564 + END
  565 + MENUITEM "Skip Write ProInfo", IDR_OPTION_SKIP_WRITE_PRODINFO
  566 +
  567 + MENUITEM "&Composite Device (Adb)", IDR_OPTION_COMPOSITE_DEVICE
  568 + MENUITEM "&Backup Nvram to PC", IDR_BACKNV_TOPC
  569 + MENUITEM "Fastboot Oem Lock", IDR_OEM_LOCK
  570 + END
  571 + POPUP "Hdcp_DRMKey"
  572 + BEGIN
  573 + MENUITEM "8389+8193Hdcp Key ", IDR_OPTION_HDCP
  574 + MENUITEM "MTK HDCP/DRM Key", IDR_OPTION_DRMKEY
  575 + MENUITEM "Hdcp Data", IDR_OPTION_HDCPDATA
  576 + END
  577 + POPUP "Identify"
  578 + BEGIN
  579 + POPUP "Engineer"
  580 + BEGIN
  581 + MENUITEM "Switch to Operator", IDR_ENG_TO_OPERATER
  582 + MENUITEM "Change Passwd", IDR_CHANGE_PASSWD
  583 + MENUITEM "Enable AutoGen", IDR_ENABLE_AUTOGEN
  584 + MENUITEM "Enable Check BtWifi", IDR_CHECK_BTWIFI
  585 + END
  586 + POPUP "Operator"
  587 + BEGIN
  588 + MENUITEM "Switch To Engineer", IDR_OPERATOR_TO_ENG
  589 + END
  590 + END
  591 + POPUP "&Help"
  592 + BEGIN
  593 + MENUITEM "&About", IDR_ABOUT_SN
  594 + END
  595 +END
  596 +
  597 +
684 #ifndef _MAC 598 #ifndef _MAC
685 ///////////////////////////////////////////////////////////////////////////// 599 /////////////////////////////////////////////////////////////////////////////
686 // 600 //
@@ -16,8 +16,6 @@ @@ -16,8 +16,6 @@
16 #include "FileSelDlg.h" 16 #include "FileSelDlg.h"
17 #include "AutoGenDlg.h" 17 #include "AutoGenDlg.h"
18 #include "HdcpEncryption.h" 18 #include "HdcpEncryption.h"
19 -#include "chooseworkmode.h"  
20 -#include "choose_db_file.h"  
21 19
22 20
23 21
@@ -201,27 +199,8 @@ BOOL CSNWriterDlg::OnInitDialog() @@ -201,27 +199,8 @@ BOOL CSNWriterDlg::OnInitDialog()
201 // TODO: Add extra initialization here 199 // TODO: Add extra initialization here
202 //g_MainDlgHandle = (DWORD)this; 200 //g_MainDlgHandle = (DWORD)this;
203 201
204 - Cchooseworkmode dlg_choose;  
205 - if (dlg_choose.DoModal() == IDOK)  
206 - {  
207 - g_topwell_workmode = (TOPWELL_TOOL_WORK_MODE)dlg_choose.mycurindex;  
208 - }  
209 - else  
210 - {  
211 - CDialog::OnCancel();  
212 - }  
213 -  
214 202
215 203
216 - if (g_topwell_workmode == TOPWELL_MODE_CHECK_IMEI)  
217 - {  
218 - Cchoose_db_file choosedb_dlg;  
219 - if (choosedb_dlg.DoModal() == IDCANCEL)  
220 - {  
221 - CDialog::OnCancel();  
222 - }  
223 - }  
224 -  
225 204
226 205
227 m_SNMenu.LoadMenu(IDR_SN_MENU); 206 m_SNMenu.LoadMenu(IDR_SN_MENU);
1 -// choose_db_file.cpp : implementation file  
2 -//  
3 -  
4 -#include "stdafx.h"  
5 -#include "sn writer.h"  
6 -#include "choose_db_file.h"  
7 -#include "Common.h"  
8 -#ifdef _DEBUG  
9 -#define new DEBUG_NEW  
10 -#undef THIS_FILE  
11 -static char THIS_FILE[] = __FILE__;  
12 -#endif  
13 -  
14 -/////////////////////////////////////////////////////////////////////////////  
15 -// Cchoose_db_file dialog  
16 -  
17 -extern META_Common_struct g_sMetaComm;  
18 -  
19 -Cchoose_db_file::Cchoose_db_file(CWnd* pParent /*=NULL*/)  
20 - : CDialog(Cchoose_db_file::IDD, pParent)  
21 -{  
22 - //{{AFX_DATA_INIT(Cchoose_db_file)  
23 - mystr2_ap_path = _T("");  
24 - mystr2_bp_path = _T("");  
25 - //}}AFX_DATA_INIT  
26 -}  
27 -  
28 -  
29 -void Cchoose_db_file::DoDataExchange(CDataExchange* pDX)  
30 -{  
31 - CDialog::DoDataExchange(pDX);  
32 - //{{AFX_DATA_MAP(Cchoose_db_file)  
33 - DDX_Text(pDX, IDC_EDIT1_AP_PATH, mystr2_ap_path);  
34 - DDX_Text(pDX, IDC_EDIT1_BP_PATH, mystr2_bp_path);  
35 - //}}AFX_DATA_MAP  
36 -}  
37 -  
38 -  
39 -BEGIN_MESSAGE_MAP(Cchoose_db_file, CDialog)  
40 - //{{AFX_MSG_MAP(Cchoose_db_file)  
41 - ON_BN_CLICKED(IDC_BUTTONAP, OnButtonap)  
42 - ON_BN_CLICKED(IDC_BUTTONBP, OnButtonbp)  
43 - //}}AFX_MSG_MAP  
44 -END_MESSAGE_MAP()  
45 -  
46 -/////////////////////////////////////////////////////////////////////////////  
47 -// Cchoose_db_file message handlers  
48 -  
49 -void Cchoose_db_file::OnButtonap()  
50 -{  
51 - char szFilter[]="Database files(*.*)|*.*";  
52 - CFileDialog dlg(TRUE, NULL, NULL,  
53 - OFN_FILEMUSTEXIST|OFN_EXPLORER|OFN_ENABLESIZING|0x10000000/*OFN_FORCESHOWHIDDEN*/,  
54 - szFilter, this);  
55 - dlg.m_ofn.lpstrTitle = _T("Select Modem_1 database file...");  
56 - if(dlg.DoModal() == IDOK)  
57 - {  
58 - g_sMetaComm.sDBFileOption.bDBInitModem_1 = false;  
59 - mystr2_ap_path = dlg.GetPathName();  
60 - }  
61 - UpdateData(FALSE);  
62 - strncpy(g_sMetaComm.sDBFileOption.strAPDbpath,(LPCTSTR)mystr2_ap_path,strlen(mystr2_ap_path)+1);  
63 -  
64 -  
65 -}  
66 -  
67 -void Cchoose_db_file::OnButtonbp()  
68 -{  
69 - char szFilter[]="Database files(*.*)|*.*";  
70 - CFileDialog dlg(TRUE, NULL, NULL,  
71 - OFN_FILEMUSTEXIST|OFN_EXPLORER|OFN_ENABLESIZING|0x10000000/*OFN_FORCESHOWHIDDEN*/,  
72 - szFilter, this);  
73 - dlg.m_ofn.lpstrTitle = _T("Select Modem_1 database file...");  
74 - if(dlg.DoModal() == IDOK)  
75 - {  
76 - g_sMetaComm.sDBFileOption.bDBInitModem_1 = false;  
77 - mystr2_bp_path = dlg.GetPathName();  
78 - }  
79 - UpdateData(FALSE);  
80 - strncpy(g_sMetaComm.sDBFileOption.strMD1Dbpath,(LPCTSTR)mystr2_bp_path,strlen(mystr2_bp_path)+1);  
81 -  
82 -}  
83 -  
84 -void Cchoose_db_file::OnOK()  
85 -{  
86 - if (mystr2_bp_path == "" || mystr2_ap_path == "")  
87 - {  
88 - MessageBox("please choose file!");  
89 - return;  
90 - }  
91 -  
92 - CDialog::OnOK();  
93 -}  
1 -#if !defined(AFX_CHOOSE_DB_FILE_H__17FC6809_62A1_413E_A13E_A67D9EE96FF4__INCLUDED_)  
2 -#define AFX_CHOOSE_DB_FILE_H__17FC6809_62A1_413E_A13E_A67D9EE96FF4__INCLUDED_  
3 -  
4 -#if _MSC_VER > 1000  
5 -#pragma once  
6 -#endif // _MSC_VER > 1000  
7 -// choose_db_file.h : header file  
8 -//  
9 -  
10 -/////////////////////////////////////////////////////////////////////////////  
11 -// Cchoose_db_file dialog  
12 -  
13 -class Cchoose_db_file : public CDialog  
14 -{  
15 -// Construction  
16 -public:  
17 - Cchoose_db_file(CWnd* pParent = NULL); // standard constructor  
18 -  
19 -// Dialog Data  
20 - //{{AFX_DATA(Cchoose_db_file)  
21 - enum { IDD = IDD_DIALOG_DB_CHOOSE };  
22 - CString mystr2_ap_path;  
23 - CString mystr2_bp_path;  
24 - //}}AFX_DATA  
25 -  
26 -  
27 -// Overrides  
28 - // ClassWizard generated virtual function overrides  
29 - //{{AFX_VIRTUAL(Cchoose_db_file)  
30 - protected:  
31 - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support  
32 - //}}AFX_VIRTUAL  
33 -  
34 -// Implementation  
35 -protected:  
36 -  
37 - // Generated message map functions  
38 - //{{AFX_MSG(Cchoose_db_file)  
39 - afx_msg void OnButtonap();  
40 - afx_msg void OnButtonbp();  
41 - virtual void OnOK();  
42 - //}}AFX_MSG  
43 - DECLARE_MESSAGE_MAP()  
44 -};  
45 -  
46 -//{{AFX_INSERT_LOCATION}}  
47 -// Microsoft Visual C++ will insert additional declarations immediately before the previous line.  
48 -  
49 -#endif // !defined(AFX_CHOOSE_DB_FILE_H__17FC6809_62A1_413E_A13E_A67D9EE96FF4__INCLUDED_)  
1 -// chooseworkmode.cpp : implementation file  
2 -//  
3 -  
4 -#include "stdafx.h"  
5 -#include "sn writer.h"  
6 -#include "chooseworkmode.h"  
7 -  
8 -#ifdef _DEBUG  
9 -#define new DEBUG_NEW  
10 -#undef THIS_FILE  
11 -static char THIS_FILE[] = __FILE__;  
12 -#endif  
13 -  
14 -/////////////////////////////////////////////////////////////////////////////  
15 -// Cchooseworkmode dialog  
16 -  
17 -  
18 -Cchooseworkmode::Cchooseworkmode(CWnd* pParent /*=NULL*/)  
19 - : CDialog(Cchooseworkmode::IDD, pParent)  
20 -{  
21 - //{{AFX_DATA_INIT(Cchooseworkmode)  
22 - mycurindex = -1;  
23 - //}}AFX_DATA_INIT  
24 -}  
25 -  
26 -  
27 -void Cchooseworkmode::DoDataExchange(CDataExchange* pDX)  
28 -{  
29 - CDialog::DoDataExchange(pDX);  
30 - //{{AFX_DATA_MAP(Cchooseworkmode)  
31 - DDX_Control(pDX, IDC_COMBO2, mylist);  
32 - DDX_CBIndex(pDX, IDC_COMBO2, mycurindex);  
33 - //}}AFX_DATA_MAP  
34 -}  
35 -  
36 -  
37 -BEGIN_MESSAGE_MAP(Cchooseworkmode, CDialog)  
38 - //{{AFX_MSG_MAP(Cchooseworkmode)  
39 - //}}AFX_MSG_MAP  
40 -END_MESSAGE_MAP()  
41 -  
42 -/////////////////////////////////////////////////////////////////////////////  
43 -// Cchooseworkmode message handlers  
44 -  
45 -BOOL Cchooseworkmode::OnInitDialog()  
46 -{  
47 - CDialog::OnInitDialog();  
48 -  
49 - mylist.SetCurSel(0);  
50 -  
51 - return TRUE; // return TRUE unless you set the focus to a control  
52 - // EXCEPTION: OCX Property Pages should return FALSE  
53 -}  
1 -#if !defined(AFX_CHOOSEWORKMODE_H__094A8DC6_29C2_46BA_AC7E_E33CFD9B3320__INCLUDED_)  
2 -#define AFX_CHOOSEWORKMODE_H__094A8DC6_29C2_46BA_AC7E_E33CFD9B3320__INCLUDED_  
3 -  
4 -#if _MSC_VER > 1000  
5 -#pragma once  
6 -#endif // _MSC_VER > 1000  
7 -// chooseworkmode.h : header file  
8 -//  
9 -  
10 -/////////////////////////////////////////////////////////////////////////////  
11 -// Cchooseworkmode dialog  
12 -  
13 -class Cchooseworkmode : public CDialog  
14 -{  
15 -// Construction  
16 -public:  
17 - Cchooseworkmode(CWnd* pParent = NULL); // standard constructor  
18 -  
19 -// Dialog Data  
20 - //{{AFX_DATA(Cchooseworkmode)  
21 - enum { IDD = IDD_CHECK_WORKMODE };  
22 - CComboBox mylist;  
23 - int mycurindex;  
24 - //}}AFX_DATA  
25 -  
26 -  
27 -// Overrides  
28 - // ClassWizard generated virtual function overrides  
29 - //{{AFX_VIRTUAL(Cchooseworkmode)  
30 - protected:  
31 - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support  
32 - //}}AFX_VIRTUAL  
33 -  
34 -// Implementation  
35 -protected:  
36 -  
37 - // Generated message map functions  
38 - //{{AFX_MSG(Cchooseworkmode)  
39 - virtual BOOL OnInitDialog();  
40 - //}}AFX_MSG  
41 - DECLARE_MESSAGE_MAP()  
42 -};  
43 -  
44 -//{{AFX_INSERT_LOCATION}}  
45 -// Microsoft Visual C++ will insert additional declarations immediately before the previous line.  
46 -  
47 -#endif // !defined(AFX_CHOOSEWORKMODE_H__094A8DC6_29C2_46BA_AC7E_E33CFD9B3320__INCLUDED_)  
Please register or login to post a comment