app/scanner2/HGImgThumb.cpp

@@ -2126,29 +2126,6 @@ HGResult HGImgThumb::refreshAllItems()
     return HGBASE_ERR_OK;
 }
 
-HGResult HGImgThumb::reloadAllItems()
-{
-    if (MouseStatus_Null != m_mousePressStatus || 0 != m_operate || m_draging || m_frameSelection)
-    {
-        return HGBASE_ERR_FAIL;
-    }
-
-    std::vector<int> index;
-    for (int i = 0; i < m_frontItems.size(); i++)
-    {
-        QString fileName = m_frontItems[i]->fileName;
-        QFile file(fileName);
-        if (!file.exists())
-        {
-            index.push_back(i);
-        }
-    }
-
-    removeItems(index, ThumbRemoveFlag_NULL);
-
-    return HGBASE_ERR_OK;
-}
-
 void HGImgThumb::notify_mouse_leave(void)
 {
     leaveEvent(nullptr);

app/scanner2/HGImgThumb.h

@@ -74,7 +74,6 @@ public:
     HGResult refreshItem(int index);
     HGResult refreshItem(const QString &fileName);
     HGResult refreshAllItems();
-    HGResult reloadAllItems();
 
     void notify_mouse_leave(void);
 

app/scanner2/mainwindow.cpp

@@ -91,10 +91,6 @@ MainWindow::MainWindow(const QString& appLang, QWidget *parent)
 {
     ui->setupUi(this); 
 
-    HGChar cacheUuid[256] = { 0 };
-    HGBase_GetUuid(cacheUuid, 256);
-    m_cacheUuid = cacheUuid;
-
     m_lockPreviewImage = nullptr;
     HGBase_CreateLock(&m_lockPreviewImage);
     m_aquireIntoSaveParam.m_fileNameStartIndex = -1;
@@ -996,7 +992,6 @@ void MainWindow::on_currItemChanged(int index)
                         if (fileInfo.isFile())
                         {
                             ++m_aquireIntoSaveParam.m_fileNameStartIndex;
-                            saveCfgValue(m_cbtn_acquireIntoCfg->currentText().toLocal8Bit().toStdString().c_str(), "startIndex", m_aquireIntoSaveParam.m_fileNameStartIndex);
                         }
                         else
                         {
@@ -1012,7 +1007,6 @@ void MainWindow::on_currItemChanged(int index)
                         m_thumb->updateItem(*iter, newFileName, false);
                         m_curBatchFileList.push_back(newFileName);
                         ++m_aquireIntoSaveParam.m_fileNameStartIndex;
-                        saveCfgValue(m_cbtn_acquireIntoCfg->currentText().toLocal8Bit().toStdString().c_str(), "startIndex", m_aquireIntoSaveParam.m_fileNameStartIndex);
                     }
                 }
             }
@@ -1295,7 +1289,6 @@ void MainWindow::on_newImage(void *image)
                         if (fileInfo.isFile())
                         {
                             ++m_aquireIntoSaveParam.m_fileNameStartIndex;
-                            saveCfgValue(m_cbtn_acquireIntoCfg->currentText().toLocal8Bit().toStdString().c_str(), "startIndex", m_aquireIntoSaveParam.m_fileNameStartIndex);
                         }
                         else
                         {
@@ -1361,10 +1354,7 @@ void MainWindow::on_newImage(void *image)
                         emit post_new_image(m_scanFileName);
                         m_scanFileName.clear();
                         if (-1 == m_scanInsertPos)
-                        {
                             ++m_aquireIntoSaveParam.m_fileNameStartIndex;
-                            saveCfgValue(m_cbtn_acquireIntoCfg->currentText().toLocal8Bit().toStdString().c_str(), "startIndex", m_aquireIntoSaveParam.m_fileNameStartIndex);
-                        }
                         m_aquireIntoMultiPageCount = 0;
                     }
                     else
@@ -1430,7 +1420,6 @@ void MainWindow::on_newImage(void *image)
                     if (fileInfo.isFile())
                     {
                         ++m_aquireIntoSaveParam.m_fileNameStartIndex;
-                        saveCfgValue(m_cbtn_acquireIntoCfg->currentText().toLocal8Bit().toStdString().c_str(), "startIndex", m_aquireIntoSaveParam.m_fileNameStartIndex);
                     }
                     else
                     {
@@ -1480,10 +1469,7 @@ void MainWindow::on_newImage(void *image)
             {
                 emit post_new_image(m_scanFileName);
                 if (-1 == m_scanInsertPos)
-                {
                     ++m_aquireIntoSaveParam.m_fileNameStartIndex;
-                    saveCfgValue(m_cbtn_acquireIntoCfg->currentText().toLocal8Bit().toStdString().c_str(), "startIndex", m_aquireIntoSaveParam.m_fileNameStartIndex);
-                }
             }
 
             m_scanFileName.clear();
@@ -1506,8 +1492,6 @@ void MainWindow::on_abnormalImage(void *image, HGUInt *result)
 
 void MainWindow::on_scanWorkingEvent()
 {
-    m_thumb->reloadAllItems();
-
     m_view->enableHighQuality(false);
     m_isScanning = true;
     updateActionStatus();
@@ -1540,10 +1524,7 @@ void MainWindow::on_scanFinishEvent()
         emit post_new_image(m_scanFileName);
         m_scanFileName.clear();
         if (-1 == m_scanInsertPos)
-        {
             ++m_aquireIntoSaveParam.m_fileNameStartIndex;
-            saveCfgValue(m_cbtn_acquireIntoCfg->currentText().toLocal8Bit().toStdString().c_str(), "startIndex", m_aquireIntoSaveParam.m_fileNameStartIndex);
-        }
         m_aquireIntoMultiPageCount = 0;
     }
 
@@ -1702,7 +1683,6 @@ void MainWindow::on_scanFinishEvent()
                         if (fileInfo.isFile())
                         {
                             ++m_aquireIntoSaveParam.m_fileNameStartIndex;
-                            saveCfgValue(m_cbtn_acquireIntoCfg->currentText().toLocal8Bit().toStdString().c_str(), "startIndex", m_aquireIntoSaveParam.m_fileNameStartIndex);
                         }
                         else
                         {
@@ -1718,7 +1698,6 @@ void MainWindow::on_scanFinishEvent()
                         m_thumb->updateItem(*iter, newFileName, false);
                         m_curBatchFileList.push_back(newFileName);
                         ++m_aquireIntoSaveParam.m_fileNameStartIndex;
-                        saveCfgValue(m_cbtn_acquireIntoCfg->currentText().toLocal8Bit().toStdString().c_str(), "startIndex", m_aquireIntoSaveParam.m_fileNameStartIndex);
                     }
                 }
             }
@@ -1874,7 +1853,7 @@ QString MainWindow::getCacheFileName(HGImage img)
     HGImageInfo imgInfo;
     HGBase_GetImageInfo(img, &imgInfo);
 
-    QString cachePath = Dialog_ClrCache::getCachePath() + m_cacheUuid + "/";
+    QString cachePath = Dialog_ClrCache::getCachePath();
     HGBase_CreateDir(getStdString(cachePath).c_str());
 
     char uuid[256] = {0};
@@ -2936,9 +2915,9 @@ void MainWindow::closeEvent(QCloseEvent *e)
         }
     }
 
-    QString cachePath = Dialog_ClrCache::getCachePath() + m_cacheUuid + "/";
+    QString cachePath = Dialog_ClrCache::getCachePath();
     QDir dir = QDir(cachePath);
-    if (dir.exists())
+    if (dir.exists() && (cachePath.endsWith("Cache/") || cachePath.endsWith("Cache\\")))
         dir.removeRecursively();
 
     m_versionDll->PostUserCloseInfo(HGVERSION_APPNAME_SCANNER, m_oemName);

app/scanner2/mainwindow.h

@@ -1,4 +1,4 @@
-#ifndef MAINWINDOW_H
+#ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
 #include <QMainWindow>
@@ -275,7 +275,6 @@ private:
 
 private:
     Ui::MainWindow *ui;
-    QString m_cacheUuid;
     bool m_canClose;
     DeviceUserMgr *m_devUserMgr;
     DeviceUser *m_devUser;