From 8bc478777a72d6f9dd4d945008dc28caff251cf0 Mon Sep 17 00:00:00 2001 From: yangjiaxuan <171295266@qq.com> Date: Wed, 22 Feb 2023 15:18:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=85=E5=8D=8E=E9=AB=98=E5=BC=80=E6=94=BE?= =?UTF-8?q?=E5=8D=87=E7=BA=A7=E6=9C=8D=E5=8A=A1=EF=BC=8C=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9=E8=AE=BF=E9=97=AE=E6=9D=83=E9=99=90?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/scanner/Scanner_zh_CN.qm | Bin 38075 -> 38136 bytes app/scanner/Scanner_zh_CN.ts | 473 ++++++++++++++++++----------------- app/scanner/Scanner_zh_EN.qm | Bin 51533 -> 51766 bytes app/scanner/Scanner_zh_EN.ts | 471 +++++++++++++++++----------------- app/scanner/mainwindow.cpp | 257 ++++++++++--------- app/scanner/mainwindow.h | 2 +- 6 files changed, 609 insertions(+), 594 deletions(-) diff --git a/app/scanner/Scanner_zh_CN.qm b/app/scanner/Scanner_zh_CN.qm index ada8edd5cbddd284a297b77ee07503cdff9b628e..f1a38dcc298c3364aea1e81f1b1b5975c3b98ca9 100644 GIT binary patch delta 4461 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 Lk~hAsXtnqcG=Ji> delta 4346 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 H-)#IpW~0Q@ diff --git a/app/scanner/Scanner_zh_CN.ts b/app/scanner/Scanner_zh_CN.ts index 2f4cff73..63168743 100644 --- a/app/scanner/Scanner_zh_CN.ts +++ b/app/scanner/Scanner_zh_CN.ts @@ -317,25 +317,25 @@ 所有页 - - - - + + + + e.g. '%1%2' 例如.“%1%2” - + ok 确定 - + cancel 取消 - + Browse directory 文件夹路径 @@ -483,14 +483,12 @@ Continue to clear? Dialog_Export - ok - 确定 + 确定 - cancel - 取消 + 取消 @@ -543,9 +541,9 @@ Page range will be "Chosen Pages". 多页保存(TIFF/PDF/OFD/GIF) - - - + + + Input is not valid. Page range will be 'Chosen Pages'. 输入无效。 @@ -565,17 +563,17 @@ Page range will be 'Chosen Pages'. 停止导出 - + export failed: 导出失败： - + tip 提示 - + export succeed 导出完成 @@ -1582,12 +1580,12 @@ Please make sure the two passwords are the same. 否 - + save, do not remind again 保存并不再提醒 - + modified, save it? 图像已被修改,是否保存修改？ @@ -2229,49 +2227,49 @@ bug description: 删除选中项 - + HuaGoScan 华高扫描软件 - + Grid 多列显示 - + Move To... 移动到... - + Insert files 插入文件 - - - + + + nodevice 没有发现扫描仪 - - + - - + + + Question 询问 - + modified, save it? 图像已被修改。 是否保存修改？ - + file lost, remove it? 文件已丢失，是否删除？ @@ -2280,7 +2278,7 @@ bug description: 已连接 - + disconnected 已断开连接 @@ -2297,17 +2295,17 @@ bug description: 扫描完成 - + Clear, then start scan 清空并启动扫描 - + Do NOT clear, then start scan 不清空并启动扫描 - + Already exist images in image list. Do you want to clear? 图像列表中已存在图像。 @@ -2322,12 +2320,12 @@ Do you want to clear? 磁盘空间不足，请删除不需要的文件，以保证有足够的空间 - + Open images 打开图片 - + Insert images 插入图片 @@ -2340,259 +2338,265 @@ Do you want to clear? 保存失败 - + binary 黑白 - + gray 256级灰度 - + rgb 24位彩色 - - - - - - - - - - + + + + + + + + + + Please wake up the device manually 请手动唤醒设备 - + thumbnailBar enabled 显示缩略图栏 - + thumbnailBar hidden 隐藏缩略图栏 - + cancel 取消 - - - + + + save succeed 保存成功 - - + + find savePath in thumbnail 图片名在列表中已存在 - + Please select at least one picture before export 请至少选中一张图片再进行导出 - + File name 文件名 - + File path 文件路径 - + File size 文件大小 - + Creation date/time 创建时间 - + Modified date/time 修改时间 - + Accessed date/time 访问时间 - + Format 格式 - + Width 宽度 - + Height 高度 - + depth 深度 - + Color model 色彩模式 - + DPI 每英寸像素点 - + Print size 打印尺寸 - + Frame 帧 - + None 无 - + Mono 黑白 - + Gray 灰度 - + Color 彩色 - + Warning 警告 - + Device is Running! Please finish scanning first. 设备正在运行！ 请先结束扫描。 - + + cache path folder limit:%1 + 无法访问当前缓存路径：%1 +请尝试在【用户】菜单登录管理员账户，前往【缓存设置】更改缓存路径。 + + + + aquireinto folder limit:%1 + 无法访问当前缓存路径：%1 +请尝试在【扫描到】更改缓存路径。 + + + Image processing failed 图像处理失败 - + Ocr init failed OCR初始化错误 - + Ocr failed OCR错误 - + File does not exist 文件不存在 - + Failed to load dynamic library 加载动态库失败 - + File data error 文件数据错误 - + Image format processing error 图像格式处理错误 - + Out of memory 内存不足 - + Failed 错误 - + The language switch is successful and takes effect the next time the software is started! 语言切换成功，下次启动软件时生效! - + Are you sure to delete selected file? 您确定彻底删除选中项文件？ - - - - - - - - - - + + + + + + + + + + already waked up device 已唤醒设备 - + be ready 就绪 - - - - - - folder limit - 无法访问“我的文档”， -请前往“扫描至”更换可访问的扫描目录再进行扫描。 + 无法访问当前缓存路径 +请尝试在【用户】菜单登录管理员账户，前往【缓存设置】更改缓存路径 - + Insufficient access rights 文件访问权限不足 @@ -2605,47 +2609,46 @@ Please finish scanning first. 图像处理失败 - + Are you sure to close 您确定要断开设备： - + ? 吗? - - + + close 关闭 - + tip 提示 - + Other versions not available 未获取到其他版本 - - + + The device does not support this operation 设备不支持该操作 - - + + IO error IO错误 - - - + + error 错误 @@ -2660,17 +2663,17 @@ Continue to close? 是否继续关闭？ - + Sure to sign out administrator account? 是否确定登出管理员账户？ - + confirm the operation 确认操作 - + Are you sure to clear the rollor acount? 你确定要清除滚轴计数吗 @@ -2679,36 +2682,36 @@ Continue to close? 请重新进入关于界面以获取最新值 - - + + <p>%1: <a href='%2'>%3</a> - - + + <p>%1: %2 - + roller number 滚轴张数 - + open scanner 打开扫描仪 - - + + app name 华高扫描软件 - - + + success 成功 @@ -2725,22 +2728,22 @@ Continue to close? 失败 - - + + failed 失败 - - - + + + warning 警告 - - - + + + the disk space in the current path is unsufficient, please select a new path or clear the disk space in time. 当前路径磁盘空间不足, 请重新选择路径或及时清理磁盘空间。 @@ -2750,116 +2753,116 @@ Continue to close? 配置丢失 - + apply setting 应用配置 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + start failed 启动失败 - + HanvonScan 汉王扫描软件 - + LanxumScan 立思辰扫描软件 - + CumtennScan 沧田扫描软件 - + MicrotekScan Microtek DocWizard EX 扫描软件 - + menu_language 语言 - + act_simpCN 简体中文 - + act_English English - + auto save 自动保存 - + when switching pictures, save the edited pictures directly without reminding 切换图片时，不提醒，直接保存编辑过的图片 - + statusBar displayed 显示状态栏 - + statusBar hidden 隐藏状态栏 - + toolBar displayed 显示工具栏 - + toolBar hidden 隐藏工具栏 - + colorInfo enabled 启用图像信息 - + colorInfo disenabled 关闭图像信息 - + enabling automatic saving 启用自动保存 - + cancel auto save 取消自动保存 - + Automatically save the edited the edited iamge when switching pictures. To cancel, uncheck the menu item: image-> automatically save 切换图片时，自动保存编辑过的图像。若想取消，请取消勾选菜单项：图像->自动保存 @@ -2880,26 +2883,26 @@ Continue to close? 发现设备 - + reconnected 重新连接 - + already connected, but open faild 已经连接，但打开失败 - - + + save image failed: 存图失败： - - - - + + + + create savepath failed: 创建文件夹失败： @@ -2908,102 +2911,102 @@ Continue to close? %1%2%3.%4 - - + + create image doc failed: 创建图片文件失败： - - - - - - - - - - - - - + + + + + + + + + + + + + save image doc failed: 保存图片文件失败： - + start failed! 启动安装程序失败！ - + There are pictures that have not been saved. Are you sure to close? 有图像未保存，确定关闭？ - + found device : %1 发现设备 : %1 - - - - - - - - - - - + + + + + + + + + + - + + tips 提示 - + Are you sure to close? 确定关闭应用软件？ - + confirm operation 确认操作 - + are you sure to clear the roller count? 您确定要清除滚轴计数吗 - - - + + + hint 提示 - - + + Roller scanned count has been set to 0. 辊轴计数已置零 - - + + Roller scanned count reset failed. 重置滚轴计数失败 - + Error 错误 - + Document missing! It would be deleted or renamed. 文档丢失！文档可能已被删除或被重命名。 @@ -3044,21 +3047,21 @@ Are you sure to close? <p>%1</p><p>版本: %2<br>版权: &#169; %3</p><p>%4%5%6%7%8%9</p> - - + + about %1 关于 %1 - - + + <p>Version: %1</p> <p>版本: %1</p> <p>版本： %1</p> - - + + <p>CopyRight: &#169; %1</p> <p>版权: &#169; %1</p> <p>版权： &#169; %1</p> diff --git a/app/scanner/Scanner_zh_EN.qm b/app/scanner/Scanner_zh_EN.qm index 9fd1b1ac65817f2f0a9621205fa1d093c79a825f..f8a66a9e126dba56d0fd127a611e9bd9338f8b00 100644 GIT binary patch delta 4856 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 SL8D?aK1?wc4BPcT*8c#k^FM9? diff --git a/app/scanner/Scanner_zh_EN.ts b/app/scanner/Scanner_zh_EN.ts index 672ea0d4..5572be5d 100644 --- a/app/scanner/Scanner_zh_EN.ts +++ b/app/scanner/Scanner_zh_EN.ts @@ -313,25 +313,25 @@ User custom pages - - - - + + + + e.g. '%1%2' For example"%1%2" - + ok OK - + cancel Cancel - + Browse directory Folder path @@ -514,19 +514,17 @@ The page range will be “selected pages” Compression options - ok - OK + OK - cancel - Cancel + Cancel - - - + + + Input is not valid. Page range will be 'Chosen Pages'. Input invalid. @@ -546,17 +544,17 @@ The page range will be “selected pages” Stop exporting - + export succeed Export completed - + export failed: Export failed: - + tip Prompt @@ -1502,12 +1500,12 @@ Please make sure the two passwords are the same. No - + save, do not remind again Save and do not prompt again - + modified, save it? Image modified, save changes? @@ -2072,133 +2070,133 @@ Please make sure the two passwords are the same. Delete selected item - + HanvonScan Hanvon scanning software - + LanxumScan LANXUM scanning software - + CumtennScan CUMTENN scanning software - + MicrotekScan Microtek DocWizard EX V1.0 - + HuaGoScan HUAGOSCAN scanning software - + menu_language Language - + act_simpCN 简体中文 - + act_English English - + Grid Multi-column display - + Move To... Move to... - + Insert files Insert file - - - + + + nodevice No scanner detected - + auto save Auto save - + when switching pictures, save the edited pictures directly without reminding Do not show prompt and save the edited images directly when switching images. - + statusBar displayed Show status bar - + statusBar hidden Hide status bar - + toolBar displayed Show toolbar - + toolBar hidden Hide toolbar - + colorInfo enabled Enable image information - + colorInfo disenabled Disable image information - + enabling automatic saving Enable auto save - + cancel auto save Cancel auto save - + Automatically save the edited the edited iamge when switching pictures. To cancel, uncheck the menu item: image-> automatically save Save edited images automatically when switching images. If you want to cancel, please deselect the menu item: Auto save images. - - + - - + + + Question Ask - + modified, save it? Image modified, save changes? @@ -2215,7 +2213,7 @@ Please make sure the two passwords are the same. No - + file lost, remove it? File lost; delete? @@ -2224,383 +2222,395 @@ Please make sure the two passwords are the same. Device discovered - + found device : %1 Device discovered: %1 - + reconnected reconnect - + already connected, but open faild connected, but failed to open - + disconnected disconnected - - - + + + the disk space in the current path is unsufficient, please select a new path or clear the disk space in time. Insufficient disk space for the current path. Please reselect a path or clear disk space immediately. - - - + + + warning Warning - - + + save image failed: Failed to save image: - - - - + + + + create savepath failed: Failed to create folder: - - + + create image doc failed: Failed to create image file: - - - - - - - - - - - - - + + + + + + + + + + + + + save image doc failed: Failed to save image: - + binary Black and white - + gray Grayscale - + rgb Color - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + start failed Failed to start - - - - - - - - - - + + + + + + + + + + Please wake up the device manually Please wake up the device manually - - - - - - - - - - + + + + + + + + + + already waked up device Device is awake - + thumbnailBar enabled Show thumbnail bar - + thumbnailBar hidden Hide thumbnail bar - + Clear, then start scan Clear and start scan - + Do NOT clear, then start scan Do not clear and start scan - + cancel Cancel - + Already exist images in image list. Do you want to clear? Image already exists in the list of images. Clear? - + Open images Open image - + Insert images Insert image - - - - - - - - - - - + + + + + + + + + + - + + tips prompt - - - + + + save succeed Saved successfully - - + + find savePath in thumbnail Image name already exists in the list - + Please select at least one picture before export Please select at least one image and then export - + File name File name - + File path File path - + File size File size - + Creation date/time Creation time - + Modified date/time Modification time - + Accessed date/time Access time - + Format Format - + Width Width - + Height Height - + depth Depth - + Color model Color mode - + DPI Pixels per inch - + Print size Print size - + Frame Frame - + None None - + Mono Black and white - + Gray Gray scale - + Color Color - + Warning Warning - + Device is Running! Please finish scanning first. Device is currently running! Please stop scanning first. - + There are pictures that have not been saved. Are you sure to close? There are unsaved images; are you sure you want to close? - + Are you sure to close? Are you sure you want to close? - + Sure to sign out administrator account? Are you sure you want to log out of the administrator account? - + confirm operation Confirm operation - + are you sure to clear the roller count? Are you sure you want to clear the roller count? - - - + + + hint Prompt - - + + Roller scanned count has been set to 0. Roller count reset to zero. - - + + Roller scanned count reset failed. Failed to reset roller count. - + Error Error - + Document missing! It would be deleted or renamed. File lost! File may be deleted or renamed. - + confirm the operation Confirm operation - + Are you sure to clear the rollor acount? Are you sure you want to clear the roller count? + + + cache path folder limit:%1 + Unable to access the current path:%1 +Please try to log in to the administrator account in the [User] menu and go to the [Cache settings] to change the cache path. + + + + aquireinto folder limit:%1 + Unable to access the current path:%1 +Please try to change the cache path in [Scan to]. + About %1 About %1 @@ -2610,192 +2620,185 @@ Are you sure to close? <p>%1</p><p>Version: %2<br>Copyright: &#169; %3</p><p>%4%5%6%7%8%9</p> - - + + about %1 About %1 - - + + <p>Version: %1</p> <p>Version: %1</p> - - + + <p>CopyRight: &#169; %1</p> <p>Copyright: &#169; %1</p> - - + + <p>%1: <a href='%2'>%3</a> <p>%1: <a href='%2'>%3</a> - - + + <p>%1: %2 <p>%1: %2 - + roller number Number of rollers - + open scanner Open scanner - - + + app name HUAGOSCAN scanning software - - + + success successfully - + be ready Ready - - + + failed failed - - - + + error Error - + start failed! Failed to start! - - - - - - folder limit - Cannot access “My Documents”. + Cannot access “My Documents”. Please go to “Scan to” and change the accessible scan folder and then perform the scan. - + Insufficient access rights Insufficient file access permissions - + Image processing failed Image processing failed - + Ocr init failed OCR initialization error - + Ocr failed OCR failed - + File does not exist File does not exist - + Failed to load dynamic library Failed to load dynamic library - + File data error File data error - + Image format processing error Image format processing error - + Out of memory Insufficient memory - + Failed Failed - + apply setting Apply configuration - + Are you sure to close Are you sure you want to disconnect device: - + ? ? - - + + close Close - + tip Prompt - + Other versions not available No other versions obtained - - + + The device does not support this operation Device does not support this operation - - + + IO error IO error - + The language switch is successful and takes effect the next time the software is started! The language switch is successful and takes effect the next time the software is started! - + Are you sure to delete selected file? Are you sure to delete the selected file completely? diff --git a/app/scanner/mainwindow.cpp b/app/scanner/mainwindow.cpp index f1bb9451..ebffc003 100644 --- a/app/scanner/mainwindow.cpp +++ b/app/scanner/mainwindow.cpp @@ -128,15 +128,17 @@ MainWindow::MainWindow(const QString& appLang, QWidget *parent) resize(950, 720); } - if (!m_versionDll->IsValid()) - { - ui->actionact_update->setVisible(false); - ui->act_feedback->setVisible(false); - } - else + ui->actionact_update->setVisible(false); + ui->act_feedback->setVisible(false); + +#if defined(OEM_HUAGAO) + if (m_versionDll->IsValid()) { + ui->actionact_update->setVisible(true); + ui->act_feedback->setVisible(true); m_versionDll->PostUserOpenInfo(HGVERSION_APPNAME_SCANNER, m_oemName); } +#endif HGChar cfgpath[512] = {0}; QString old; @@ -1309,9 +1311,19 @@ void MainWindow::on_export_scanned_image(void) void MainWindow::on_continueScan() { - if(!isLimitAccessFolder("")) + if (1 == m_scanType) { - return; + if(!isLimitAccessFolder(1)) + { + return; + } + } + else if (2 == m_scanType) + { + if(!isLimitAccessFolder(2)) + { + return; + } } if (!dev_que_.is_online() || m_isScanning || 0 == m_scanType) @@ -3218,7 +3230,7 @@ void MainWindow::on_act_scannerSettings_triggered() void MainWindow::on_act_acquire_triggered() { - if(!isLimitAccessFolder("")) + if(!isLimitAccessFolder(1)) { return; } @@ -3296,7 +3308,7 @@ void MainWindow::on_act_acquire_triggered() void MainWindow::on_act_acquireSingle_triggered() { - if(!isLimitAccessFolder("")) + if(!isLimitAccessFolder(1)) { return; } @@ -3408,7 +3420,7 @@ void MainWindow::on_act_acquireInto_triggered() // m_aquireIntoSaveParam.m_savePath = getStdFileName(m_aquireIntoSaveParam.m_savePath + dateTime.toString("yyyyMMddhhmmss") + "/"); - if(!isLimitAccessFolder(m_aquireIntoSaveParam.m_savePath)) + if(!isLimitAccessFolder(2)) { return; } @@ -3469,7 +3481,7 @@ void MainWindow::on_act_acquireInto_triggered() void MainWindow::on_act_insertFromScanner_triggered() { - if(!isLimitAccessFolder("")) + if(!isLimitAccessFolder(1)) { return; } @@ -3733,42 +3745,43 @@ void MainWindow::upgradeApp(QString pkgPath) QString tmpPath(tmpPath2); #if defined(HG_CMP_MSC) - #if defined(OEM_HANWANG) - QFile::remove(tmpPath + "HwUpgradeApp.exe"); - QFile::copy(curPath + "HwUpgradeApp.exe", tmpPath + "HwUpgradeApp.exe"); - QFile::remove(tmpPath + "HwBase.dll"); - QFile::copy(curPath + "HwBase.dll", tmpPath + "HwBase.dll"); - QFile::remove(tmpPath + "HwVersion.dll"); - QFile::copy(curPath + "HwVersion.dll", tmpPath + "HwVersion.dll"); - #elif defined(OEM_LISICHENG) - QFile::remove(tmpPath + "LscUpgradeApp.exe"); - QFile::copy(curPath + "LscUpgradeApp.exe", tmpPath + "LscUpgradeApp.exe"); - QFile::remove(tmpPath + "LscBase.dll"); - QFile::copy(curPath + "LscBase.dll", tmpPath + "LscBase.dll"); - QFile::remove(tmpPath + "LscVersion.dll"); - QFile::copy(curPath + "LscVersion.dll", tmpPath + "LscVersion.dll"); - #elif defined(OEM_CANGTIAN) - QFile::remove(tmpPath + "CtsUpgradeApp.exe"); - QFile::copy(curPath + "CtsUpgradeApp.exe", tmpPath + "CtsUpgradeApp.exe"); - QFile::remove(tmpPath + "CtsBase.dll"); - QFile::copy(curPath + "CtsBase.dll", tmpPath + "CtsBase.dll"); - QFile::remove(tmpPath + "CtsVersion.dll"); - QFile::copy(curPath + "CtsVersion.dll", tmpPath + "CtsVersion.dll"); - #elif defined(OEM_ZHONGJING) - QFile::remove(tmpPath + "ZJUpgradeApp.exe"); - QFile::copy(curPath + "ZJUpgradeApp.exe", tmpPath + "ZJUpgradeApp.exe"); - QFile::remove(tmpPath + "ZJBase.dll"); - QFile::copy(curPath + "ZJBase.dll", tmpPath + "ZJBase.dll"); - QFile::remove(tmpPath + "ZJVersion.dll"); - QFile::copy(curPath + "ZJVersion.dll", tmpPath + "ZJVersion.dll"); - #else +// #if defined(OEM_HANWANG) +// QFile::remove(tmpPath + "HwUpgradeApp.exe"); +// QFile::copy(curPath + "HwUpgradeApp.exe", tmpPath + "HwUpgradeApp.exe"); +// QFile::remove(tmpPath + "HwBase.dll"); +// QFile::copy(curPath + "HwBase.dll", tmpPath + "HwBase.dll"); +// QFile::remove(tmpPath + "HwVersion.dll"); +// QFile::copy(curPath + "HwVersion.dll", tmpPath + "HwVersion.dll"); +// #elif defined(OEM_LISICHENG) +// QFile::remove(tmpPath + "LscUpgradeApp.exe"); +// QFile::copy(curPath + "LscUpgradeApp.exe", tmpPath + "LscUpgradeApp.exe"); +// QFile::remove(tmpPath + "LscBase.dll"); +// QFile::copy(curPath + "LscBase.dll", tmpPath + "LscBase.dll"); +// QFile::remove(tmpPath + "LscVersion.dll"); +// QFile::copy(curPath + "LscVersion.dll", tmpPath + "LscVersion.dll"); +// #elif defined(OEM_CANGTIAN) +// QFile::remove(tmpPath + "CtsUpgradeApp.exe"); +// QFile::copy(curPath + "CtsUpgradeApp.exe", tmpPath + "CtsUpgradeApp.exe"); +// QFile::remove(tmpPath + "CtsBase.dll"); +// QFile::copy(curPath + "CtsBase.dll", tmpPath + "CtsBase.dll"); +// QFile::remove(tmpPath + "CtsVersion.dll"); +// QFile::copy(curPath + "CtsVersion.dll", tmpPath + "CtsVersion.dll"); +// #elif defined(OEM_ZHONGJING) +// QFile::remove(tmpPath + "ZJUpgradeApp.exe"); +// QFile::copy(curPath + "ZJUpgradeApp.exe", tmpPath + "ZJUpgradeApp.exe"); +// QFile::remove(tmpPath + "ZJBase.dll"); +// QFile::copy(curPath + "ZJBase.dll", tmpPath + "ZJBase.dll"); +// QFile::remove(tmpPath + "ZJVersion.dll"); +// QFile::copy(curPath + "ZJVersion.dll", tmpPath + "ZJVersion.dll"); +// #else + QFile::remove(tmpPath + "HGUpgradeApp.exe"); QFile::copy(curPath + "HGUpgradeApp.exe", tmpPath + "HGUpgradeApp.exe"); QFile::remove(tmpPath + "HGBase.dll"); QFile::copy(curPath + "HGBase.dll", tmpPath + "HGBase.dll"); QFile::remove(tmpPath + "HGVersion.dll"); QFile::copy(curPath + "HGVersion.dll", tmpPath + "HGVersion.dll"); - #endif +// #endif QFile::remove(tmpPath + "msvcp140.dll"); QFile::copy(curPath + "msvcp140.dll", tmpPath + "msvcp140.dll"); @@ -3792,42 +3805,42 @@ void MainWindow::upgradeApp(QString pkgPath) QFile::remove(tmpPath + "imageformats/qgif.dll"); QFile::copy(curPath + "imageformats/qgif.dll", tmpPath + "imageformats/qgif.dll"); #else - #if defined(OEM_HANWANG) - QFile::remove(tmpPath + "HwUpgradeApp"); - QFile::copy(curPath + "HwUpgradeApp", tmpPath + "HwUpgradeApp"); - //QFile::remove(tmpPath + "libHwBase.so"); - //QFile::copy(curPath + "libHwBase.so", tmpPath + "libHwBase.so"); - //QFile::remove(tmpPath + "libHwVersion.so"); - //QFile::copy(curPath + "libHwVersion.so", tmpPath + "libHwVersion.so"); - #elif defined(OEM_LISICHENG) - QFile::remove(tmpPath + "LscUpgradeApp"); - QFile::copy(curPath + "LscUpgradeApp", tmpPath + "LscUpgradeApp"); - //QFile::remove(tmpPath + "libLscBase.so"); - //QFile::copy(curPath + "libLscBase.so", tmpPath + "libLscBase.so"); - //QFile::remove(tmpPath + "libLscVersion.so"); - //QFile::copy(curPath + "libLscVersion.so", tmpPath + "libLscVersion.so"); - #elif defined(OEM_CANGTIAN) - QFile::remove(tmpPath + "CtsUpgradeApp"); - QFile::copy(curPath + "CtsUpgradeApp", tmpPath + "CtsUpgradeApp"); - //QFile::remove(tmpPath + "libCtsBase.so"); - //QFile::copy(curPath + "libCtsBase.so", tmpPath + "libCtsBase.so"); - //QFile::remove(tmpPath + "libCtsVersion.so"); - //QFile::copy(curPath + "libCtsVersion.so", tmpPath + "libCtsVersion.so"); - #elif defined(OEM_ZHONGJING) - QFile::remove(tmpPath + "ZjUpgradeApp"); - QFile::copy(curPath + "ZjUpgradeApp", tmpPath + "ZjUpgradeApp"); - //QFile::remove(tmpPath + "libZjBase.so"); - //QFile::copy(curPath + "libZjBase.so", tmpPath + "libZjBase.so"); - //QFile::remove(tmpPath + "libZjVersion.so"); - //QFile::copy(curPath + "libZjVersion.so", tmpPath + "libZjVersion.so"); - #else +// #if defined(OEM_HANWANG) +// QFile::remove(tmpPath + "HwUpgradeApp"); +// QFile::copy(curPath + "HwUpgradeApp", tmpPath + "HwUpgradeApp"); +// //QFile::remove(tmpPath + "libHwBase.so"); +// //QFile::copy(curPath + "libHwBase.so", tmpPath + "libHwBase.so"); +// //QFile::remove(tmpPath + "libHwVersion.so"); +// //QFile::copy(curPath + "libHwVersion.so", tmpPath + "libHwVersion.so"); +// #elif defined(OEM_LISICHENG) +// QFile::remove(tmpPath + "LscUpgradeApp"); +// QFile::copy(curPath + "LscUpgradeApp", tmpPath + "LscUpgradeApp"); +// //QFile::remove(tmpPath + "libLscBase.so"); +// //QFile::copy(curPath + "libLscBase.so", tmpPath + "libLscBase.so"); +// //QFile::remove(tmpPath + "libLscVersion.so"); +// //QFile::copy(curPath + "libLscVersion.so", tmpPath + "libLscVersion.so"); +// #elif defined(OEM_CANGTIAN) +// QFile::remove(tmpPath + "CtsUpgradeApp"); +// QFile::copy(curPath + "CtsUpgradeApp", tmpPath + "CtsUpgradeApp"); +// //QFile::remove(tmpPath + "libCtsBase.so"); +// //QFile::copy(curPath + "libCtsBase.so", tmpPath + "libCtsBase.so"); +// //QFile::remove(tmpPath + "libCtsVersion.so"); +// //QFile::copy(curPath + "libCtsVersion.so", tmpPath + "libCtsVersion.so"); +// #elif defined(OEM_ZHONGJING) +// QFile::remove(tmpPath + "ZjUpgradeApp"); +// QFile::copy(curPath + "ZjUpgradeApp", tmpPath + "ZjUpgradeApp"); +// //QFile::remove(tmpPath + "libZjBase.so"); +// //QFile::copy(curPath + "libZjBase.so", tmpPath + "libZjBase.so"); +// //QFile::remove(tmpPath + "libZjVersion.so"); +// //QFile::copy(curPath + "libZjVersion.so", tmpPath + "libZjVersion.so"); +// #else QFile::remove(tmpPath + "HGUpgradeApp"); QFile::copy(curPath + "HGUpgradeApp", tmpPath + "HGUpgradeApp"); //QFile::remove(tmpPath + "libHGBase.so"); //QFile::copy(curPath + "libHGBase.so", tmpPath + "libHGBase.so"); //QFile::remove(tmpPath + "libHGVersion.so"); //QFile::copy(curPath + "libHGVersion.so", tmpPath + "libHGVersion.so"); - #endif +// #endif #endif QProcess proc; @@ -3840,29 +3853,29 @@ void MainWindow::upgradeApp(QString pkgPath) argList.push_back(QString("-language=%1").arg(m_currLang.toStdString().c_str())); #if defined(HG_CMP_MSC) - #if defined(OEM_HANWANG) - isSuccessdStart = proc.startDetached(tmpPath + "HwUpgradeApp.exe", argList); - #elif defined(OEM_LISICHENG) - isSuccessdStart = proc.startDetached(tmpPath + "LscUpgradeApp.exe", argList); - #elif defined(OEM_CANGTIAN) - isSuccessdStart = proc.startDetached(tmpPath + "CtsUpgradeApp.exe", argList); - #elif defined(OEM_ZHONGJING) - isSuccessdStart = proc.startDetached(tmpPath + "ZJUpgradeApp.exe", argList); - #else +// #if defined(OEM_HANWANG) +// isSuccessdStart = proc.startDetached(tmpPath + "HwUpgradeApp.exe", argList); +// #elif defined(OEM_LISICHENG) +// isSuccessdStart = proc.startDetached(tmpPath + "LscUpgradeApp.exe", argList); +// #elif defined(OEM_CANGTIAN) +// isSuccessdStart = proc.startDetached(tmpPath + "CtsUpgradeApp.exe", argList); +// #elif defined(OEM_ZHONGJING) +// isSuccessdStart = proc.startDetached(tmpPath + "ZJUpgradeApp.exe", argList); +// #else isSuccessdStart = proc.startDetached(tmpPath + "HGUpgradeApp.exe", argList); - #endif +// #endif #else - #if defined(OEM_HANWANG) - isSuccessdStart = proc.startDetached(tmpPath + "HwUpgradeApp", argList); - #elif defined(OEM_LISICHENG) - isSuccessdStart = proc.startDetached(tmpPath + "LscUpgradeApp", argList); - #elif defined(OEM_CANGTIAN) - isSuccessdStart = proc.startDetached(tmpPath + "CtsUpgradeApp", argList); - #elif defined(OEM_ZHONGJING) - isSuccessdStart = proc.startDetached(tmpPath + "ZjUpgradeApp", argList); - #else +// #if defined(OEM_HANWANG) +// isSuccessdStart = proc.startDetached(tmpPath + "HwUpgradeApp", argList); +// #elif defined(OEM_LISICHENG) +// isSuccessdStart = proc.startDetached(tmpPath + "LscUpgradeApp", argList); +// #elif defined(OEM_CANGTIAN) +// isSuccessdStart = proc.startDetached(tmpPath + "CtsUpgradeApp", argList); +// #elif defined(OEM_ZHONGJING) +// isSuccessdStart = proc.startDetached(tmpPath + "ZjUpgradeApp", argList); +// #else isSuccessdStart = proc.startDetached(tmpPath + "HGUpgradeApp", argList); - #endif +// #endif #endif if (isSuccessdStart) @@ -3879,49 +3892,45 @@ void MainWindow::upgradeApp(QString pkgPath) } } -bool MainWindow::isLimitAccessFolder(QString filePath) +bool MainWindow::isLimitAccessFolder(int type) { - HGChar documentsPath[512]; - HGBase_GetDocumentsPath(documentsPath, 512); - HGChar procName[512]; - HGBase_GetProcessName(procName, 512); - strcat(documentsPath, procName); - HGBase_CreateDir(getStdString(documentsPath).c_str()); + QString cachePath = Dialog_ClrCache::getCachePath(); + QString aquireIntoPath = m_aquireIntoSaveParam.m_savePath; + QString filePath; HGChar uuid[512]; HGBase_GetUuid(uuid, 512); - strcat(documentsPath, "/"); - strcat(documentsPath, uuid); - HGResult ret = HGBase_CreateDir(getStdString(documentsPath).c_str()); - if(ret != HGBASE_ERR_OK) + + if (1 == type) { - if(!filePath.isEmpty()) + filePath = cachePath + uuid; + } + else if (2 == type) + { + filePath = aquireIntoPath + uuid; + } + + HGResult ret = HGBase_CreateDir(getStdString(filePath).c_str()); + if (ret != HGBASE_ERR_OK) + { + QString info; + if (1 == type) { - HGChar uuid2[512]; - HGBase_GetUuid(uuid2, 512); - filePath += uuid2; - ret = HGBase_CreateDir(getStdString(filePath).c_str()); - if (ret != HGBASE_ERR_OK) - { - QMessageBox::critical(this, tr("error"), tr("folder limit")); - m_dialogLog->addLog(tr("folder limit"), true); - m_wndStatusBar->setDeviceStatusInfo(tr("folder limit"), true); - return false; - } - else - { - HGBase_DeleteDir(getStdString(filePath).c_str()); - } - return true; + info = tr("cache path folder limit:%1").arg(cachePath); } - QMessageBox::critical(this, tr("error"), tr("folder limit")); - m_dialogLog->addLog(tr("folder limit"), true); - m_wndStatusBar->setDeviceStatusInfo(tr("folder limit"), true); + else if (2 == type) + { + info = tr("aquireinto folder limit:%1").arg(aquireIntoPath); + } + + QMessageBox::critical(this, tr("error"), info); + m_dialogLog->addLog(info, true); + m_wndStatusBar->setDeviceStatusInfo(info, true); return false; } else { - HGBase_DeleteDir(getStdString(documentsPath).c_str()); + HGBase_DeleteDir(getStdString(filePath).c_str()); } return true; } diff --git a/app/scanner/mainwindow.h b/app/scanner/mainwindow.h index 9bf95592..5ce10320 100644 --- a/app/scanner/mainwindow.h +++ b/app/scanner/mainwindow.h @@ -268,7 +268,7 @@ private: bool open_scanner(const QString& name, const QString& scheme); bool judgeDiskSpace(QString currentPath, bool showDlg = true); void upgradeApp(QString pkgPath); - bool isLimitAccessFolder(QString filePath); + bool isLimitAccessFolder(int type); //type:1-aquire,2-aquireInto static QString GetDevType(const QString& fwVersion, bool &canLock); void upgradeFwAndLockDevice(); void deleteOverdueLogFile(const QString& logFilePath);