Merge branch 'master' of tpgithost:xiemeng/xiemeng_intex_write_tool

# Conflicts:
#	SN Writer.rc

@@ -998,7 +998,7 @@ bool SPScertInit(const char *strSPScertFilePath)
 
 E_TARGET_TYPE GetTargetType()
 {
-    return g_sMetaComm.eTargetType;
+    return SMART_PHONE;//g_sMetaComm.eTargetType;
 }
 
 bool CheckFileSize( const char *strFilePath, const long fileSize )

@@ -158,13 +158,15 @@ int SNBase::UpdateUIMsg(const char * strMsg, ...)
     int iRet = 0;
     char szBuf[256] = "";
     va_list varg;
+	CString atime;
 
     va_start(varg, strMsg);
     iRet = vsprintf(szBuf, strMsg, varg);
     va_end(varg);
+	atime.Format("[%2dS]",g_pMainDlg->mytimecount);
 
 //    g_pMainDlg->SetDlgItemText(IDC_OPERATE_INFO, szBuf);
-	g_pMainDlg->myloglist.SetCurSel(g_pMainDlg->myloglist.AddString(szBuf));
+	g_pMainDlg->myloglist.SetCurSel(g_pMainDlg->myloglist.AddString(atime+szBuf));
 
     return iRet;
 }

@@ -4178,7 +4178,7 @@ void SmartPhoneSN::ThreadMainEntryPoint()
                 && g_sMetaComm.sWriteOption.bWriteHdcp == false
                 && g_sMetaComm.sWriteOption.bInstallHdcpData == false)
         {
-            PopupMsgBox("Warning", MB_OK | MB_ICONWARNING, "At least select one write option!!");
+            PopupMsgBox("Warning", MB_OK | MB_ICONWARNING, "At least select one write option!!\nplease click config button");
             return;
         }
         else

@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 /nologo /subsystem:windows /machine:I386
-# ADD LINK32 shlwapi.lib "./mtklib/meta/lib/*.lib" "./mtklib/Eboot/lib/*.lib" "./mtklib/Security/lib/*.lib" "./mtklib/SNFstream/lib/*.lib" "./mtklib/DebugTrace/lib/*.lib" "./mtklib/usbswitchtool/lib/*.lib" /nologo /subsystem:windows /machine:I386
+# ADD LINK32 shlwapi.lib "./mtklib/meta/lib/*.lib" "./mtklib/Eboot/lib/*.lib" "./mtklib/Security/lib/*.lib" "./mtklib/SNFstream/lib/*.lib" "./mtklib/DebugTrace/lib/*.lib" "./mtklib/usbswitchtool/lib/*.lib" /nologo /subsystem:windows /machine:I386 /out:"..\intex_tool\SN Writer.exe"
 # SUBTRACT LINK32 /pdb:none
 
 !ELSEIF  "$(CFG)" == "SN Writer - Win32 Debug"

@@ -151,38 +151,37 @@ BEGIN
     LTEXT           "......",IDC_PWD_MSG,7,50,273,23
 END
 
-IDD_SNWRITER_DIALOG DIALOGEX 0, 0, 335, 193
+IDD_SNWRITER_DIALOG DIALOGEX 0, 0, 299, 145
 STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | 
     WS_SYSMENU
 EXSTYLE WS_EX_APPWINDOW
 CAPTION "SN Writer(TOPWELL)"
 FONT 10, "System"
 BEGIN
-    LTEXT           "ComPort:",IDC_STATIC,13,22,43,9,0,WS_EX_RIGHT
-    EDITTEXT        IDC_COUNT_TOTAL,33,122,22,13,ES_AUTOHSCROLL | 
+    LTEXT           "ComPort:",IDC_STATIC,5,15,34,9,0,WS_EX_RIGHT
+    EDITTEXT        IDC_COUNT_TOTAL,185,13,22,13,ES_AUTOHSCROLL | 
                     ES_READONLY
-    PUSHBUTTON      "Config",IDC_BTN_SYSCONFIG,110,54,43,14
-    DEFPUSHBUTTON   "Start",IDC_BTN_START,14,54,43,14
-    PUSHBUTTON      "Quit",IDC_BTN_QUIT,62,54,43,14
-    EDITTEXT        IDC_COUNT_PASS,33,137,22,13,ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_COUNT_FAIL,33,152,22,13,ES_AUTOHSCROLL | ES_READONLY
-    LTEXT           "Target Type:",IDC_STATIC,13,38,43,9,0,WS_EX_RIGHT
-    LTEXT           "Total:",IDC_STATIC,6,125,20,10
-    LTEXT           "Pass:",IDC_STATIC_PASS,6,140,21,10
-    LTEXT           "Fail:",IDC_STATIC,6,155,18,10
-    GROUPBOX        "config",IDC_STATIC,0,0,178,95
-    COMBOBOX        IDC_COMBO_COMPORT,61,19,87,51,CBS_DROPDOWNLIST | 
+    PUSHBUTTON      "Config",IDC_BTN_SYSCONFIG,48,29,34,14
+    DEFPUSHBUTTON   "Start",IDC_BTN_START,8,29,34,14
+    PUSHBUTTON      "Quit",IDC_BTN_QUIT,88,29,34,14
+    EDITTEXT        IDC_COUNT_PASS,185,29,22,13,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_COUNT_FAIL,185,45,22,13,ES_AUTOHSCROLL | ES_READONLY
+    LTEXT           "Total:",IDC_STATIC,157,16,20,10
+    LTEXT           "Pass:",IDC_STATIC_PASS,158,32,21,10
+    LTEXT           "Fail:",IDC_STATIC,158,48,18,10
+    GROUPBOX        "config",IDC_STATIC,0,0,149,67
+    COMBOBOX        IDC_COMBO_COMPORT,49,12,51,51,CBS_DROPDOWNLIST | 
                     CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_COMBO_TARGET_TYPE,61,35,87,63,CBS_DROPDOWNLIST | 
-                    CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "Button1",IDC_BTN_INDITE,68,119,108,50,BS_BITMAP | 
+    COMBOBOX        IDC_COMBO_TARGET_TYPE,4,133,16,63,CBS_DROPDOWNLIST | 
+                    CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "Button1",IDC_BTN_INDITE,209,12,76,50,BS_BITMAP | 
                     BS_FLAT
-    CONTROL         "",IDC_MAINUI_TIME_COUNT,"Static",SS_LEFTNOWORDWRAP | 
-                    WS_GROUP,61,109,56,9,WS_EX_RIGHT | WS_EX_STATICEDGE
-    LTEXT           "Static",IDC_STATIC_SWVER,6,75,166,11,0,WS_EX_STATICEDGE
-    LISTBOX         IDC_LIST_LOG,180,4,152,168,LBS_NOINTEGRALHEIGHT | 
+    CTEXT           "",IDC_MAINUI_TIME_COUNT,109,14,37,9,SS_CENTERIMAGE,
+                    WS_EX_RIGHT
+    LTEXT           "Static",IDC_STATIC_SWVER,6,49,138,11,0,WS_EX_STATICEDGE
+    LISTBOX         IDC_LIST_LOG,1,69,297,62,LBS_NOINTEGRALHEIGHT | 
                     WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Result",IDC_STATIC,0,101,177,92
+    GROUPBOX        "Result",IDC_STATIC,151,0,148,67
 END
 
 IDD_SCANDATA_DIALOG DIALOGEX 0, 0, 236, 316

@@ -390,7 +390,7 @@ void CSNWriterDlg::EnableUIItem()
     if (g_LoginIdentify == ENGINEER)
     {
         GetDlgItem(IDC_BTN_SYSCONFIG)->EnableWindow(TRUE);
-        GetDlgItem(IDC_COMBO_TARGET_TYPE)->EnableWindow(TRUE);
+        GetDlgItem(IDC_COMBO_TARGET_TYPE)->ShowWindow(SW_HIDE);
 
         m_SNMenu.EnableMenuItem(0, MF_ENABLED | MF_BYPOSITION);
         m_SNMenu.EnableMenuItem(1, MF_ENABLED | MF_BYPOSITION);
@@ -402,7 +402,7 @@ void CSNWriterDlg::EnableUIItem()
     else
     {
         GetDlgItem(IDC_BTN_SYSCONFIG)->EnableWindow(FALSE);
-        GetDlgItem(IDC_COMBO_TARGET_TYPE)->EnableWindow(FALSE);
+        GetDlgItem(IDC_COMBO_TARGET_TYPE)->ShowWindow(SW_HIDE);
         m_SNMenu.EnableMenuItem(0, MF_GRAYED | MF_DISABLED | MF_BYPOSITION);
         m_SNMenu.EnableMenuItem(1, MF_GRAYED | MF_DISABLED | MF_BYPOSITION);
         m_SNMenu.EnableMenuItem(2, MF_GRAYED | MF_DISABLED | MF_BYPOSITION);
@@ -417,7 +417,7 @@ void CSNWriterDlg::EnableUIItem()
 void CSNWriterDlg::DisableUIItem()
 {
     GetDlgItem(IDC_BTN_SYSCONFIG)->EnableWindow(FALSE);
-    GetDlgItem(IDC_COMBO_TARGET_TYPE)->EnableWindow(FALSE);
+	GetDlgItem(IDC_COMBO_TARGET_TYPE)->ShowWindow(SW_HIDE);
     GetDlgItem(IDC_COMBO_COMPORT)->EnableWindow(FALSE);
     m_SNMenu.EnableMenuItem( 0, MF_GRAYED | MF_DISABLED | MF_BYPOSITION );
     m_SNMenu.EnableMenuItem( 1, MF_GRAYED | MF_DISABLED | MF_BYPOSITION );
@@ -539,12 +539,12 @@ void CSNWriterDlg::SetUIItem()
 {
     GetComPortDynamiclly();
 
-    m_cTargetTypeBox.InsertString(FEATURE_PHONE, "Feature Phone");
-    m_cTargetTypeBox.InsertString(SMART_PHONE, "Smart Phone");
-    m_cTargetTypeBox.InsertString(SMART_PHONE_DUALMODEM, "SP DualModem");
-    m_cTargetTypeBox.InsertString(TABLET_WIFI_ONLY, "Tablet Wifi Only");
-    m_cTargetTypeBox.InsertString(RNDIG_DONGLE, "Rndis Dongle");
-    m_cTargetTypeBox.SetCurSel(g_sMetaComm.eTargetType);
+//     m_cTargetTypeBox.InsertString(FEATURE_PHONE, "Feature Phone");
+//     m_cTargetTypeBox.InsertString(SMART_PHONE, "Smart Phone");
+//     m_cTargetTypeBox.InsertString(SMART_PHONE_DUALMODEM, "SP DualModem");
+//     m_cTargetTypeBox.InsertString(TABLET_WIFI_ONLY, "Tablet Wifi Only");
+//     m_cTargetTypeBox.InsertString(RNDIG_DONGLE, "Rndis Dongle");
+    m_cTargetTypeBox.SetCurSel(SMART_PHONE);
 }
 
 // If you add a minimize button to your dialog, you will need the code below
@@ -731,6 +731,10 @@ void CSNWriterDlg::OnSelchangeComboTargetType()
 HBRUSH CSNWriterDlg::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor)
 {
     HBRUSH hbr = CDialog::OnCtlColor(pDC, pWnd, nCtlColor);
+    if((IDC_MAINUI_TIME_COUNT == pWnd->GetDlgCtrlID()))
+    {
+        pDC->SetTextColor(RGB(255,0,0));
+    }
 
     return hbr;
 }