From 4f35e2158fe979aa357707f6469e32db47ddcbf8 Mon Sep 17 00:00:00 2001 From: yangjiaxuan <171295266@qq.com> Date: Tue, 25 Oct 2022 19:17:33 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=BD=93=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E8=AE=BF=E9=97=AE=E7=BC=93=E5=AD=98=E7=9B=AE=E5=BD=95=EF=BC=8C?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=E8=87=B3=E5=8A=9F=E8=83=BD=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=E7=9B=AE=E5=BD=95=E5=8F=AF=E7=BB=A7=E7=BB=AD=E6=89=AB=E6=8F=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/scanner/Scanner_zh_CN.qm | Bin 35286 -> 35302 bytes app/scanner/Scanner_zh_CN.ts | 3 ++- app/scanner/mainwindow.cpp | 40 ++++++++++++++++++++++++++--------- app/scanner/mainwindow.h | 2 +- 4 files changed, 33 insertions(+), 12 deletions(-) diff --git a/app/scanner/Scanner_zh_CN.qm b/app/scanner/Scanner_zh_CN.qm index 161de402a20f258d8ed90fcdc09cd5fa27109e0e..217d627bfa066ad34cabe36d43c1a1a6bfb02c91 100644 GIT binary patch delta 885 zcmX9+ZA_b06n@Uz_xt72)YP`9(6VgQsk2}u%#XP&j8qr-n1cY(rn)h3K*u1X$`Xgp zku5Tq@z^Xgi}7p!bR!~-A<~)2qRC+JLl?v}F+}{aIW$g0Oi(ZJ&wcJW_ug}!=iKKy zD?hU`;w9@Tz^DaY&T%2t+|{Q88@B^JGeB8Bpwt1;5YXl00ji)2JV8ZDr^7k&@Awqx z{|e}vhpTcE5O@Kusac?O60Sd=01i7)PkjVD)&q4`o)?!uy*>mSJoGGEJhypxq1gV~H$+d@t z>3`&)Hu5$D+xoS!Gj5>u7j0}}Q6g&@@12s{E-f>zNc=#{d|^nure$tqC8juT`e{G+ zni2Yj&zlwWDCf*BI>FUexY(OTKyca$7QCZR zWlsZ559l+-MxccBxruIhdXuLuKYh)M)*0&KS8P9Za@vkj5$Eh6ZRRyQLa*}{r=NWM ziQ_MbTK}jQ0D8-IU2O--3vI7gcI{r^oa2}5mYtZjYM+ZsMy(}Wl~+seayqZkbIEBn ze+N37oNnJ`p!Wo?<%K=xoKxpjpkvq>E?kmT>bP74=>|852u<^VNYG_o6pu(u#J}I}kuFp@m)}KCan=VS@_m%OGyH+1M0313-aWq#UP>>ej<4rZONoZvL#KZ@`Sf~Js*DDDv)=yz0%ZwD delta 869 zcmX9+YiyHc6n@Uvez$&m*VNQ~R2^-{Wr*O18FQNkmB3O%vJ1#E7AOTXJ2o6+mpag} z8qK0%V-k*)kQf34j6YyooSSCaLUbfvHX%d_nKU898o`VhVIxYWzKMU{=bZO)&hwo2 z`IVKctPK0ftN`>HVBZuMQuQPI=77b|10Cmqr}6=%7AOe;Z5sDd86D>|EmU?t;4Il| zPXWoVf&JgXwQdQpU?*IYmw{CiaLqjjbUuK)|1|Jy2i%wCd3Y(@R}TSucKnZRtGQHZ z3Ll2PsuBpTf!_3!Z1e^6KKUwi4Ejk`=D%@TaROoJ6GL+MK8%7Wu-Aq$ISaIY!>X&y zcLgQghGYP&E_Z;Y+g#-e(zo2|8h9u%i(SW>fZ*$BdEzagy@Q22MuXhyu9tc)%J^em zqB`aYMJsp7L6mS*Eu%%8QX^)UGG4S0=vu)!H9{A7rDju{E45-t_4!_U9nxr~<)CDc(2s`hBoSxGvByb8~^k!P;*$z3`_vK<~d~s z0|&Lq%zMC=71||zF|d@hYw32N`DdOoZTgIJ=22?q10I{Uamo{+e9n4;6ySM}L!G?R zN|MIsEIY8s{Kq{A&=HU8`xcZuI*PiYuS?BtQ9eDc|MFvM)3l!%&VaRPUY46 zhOD^pC-CZvR(ru$K%$%H^NM}_R{t3{u)D_^D7+)9yuhU*NYh*=97=Pqh|wpU6VBRO zVnL&{-a3zXG$JcUuZhrb0(k8s5#A;>HalWjV-nb`h~>Xab{l>XPd4n34v7lq-5#K& zj_dMckLSdNqOCwfsknIXFTiJs>6!b|DPHkM&rP7dTKxOtOESO5+59#t=PGY;fW6hz zKLGv)Z|(XL`4@(F%aAnw{xBc%)@TQsWq5Dorgy$k-oMdRP_+H;zQIjZu{ZlN$vqo8 fQ!}B*UU{c_uA$dD?Xm+O diff --git a/app/scanner/Scanner_zh_CN.ts b/app/scanner/Scanner_zh_CN.ts index 76edf0af..aa818ee0 100644 --- a/app/scanner/Scanner_zh_CN.ts +++ b/app/scanner/Scanner_zh_CN.ts @@ -2350,7 +2350,8 @@ Please finish scanning first. folder limit - 无法访问“我的文档”，建议前往设置关闭“文件夹限制访问” + 无法访问“我的文档”， +请前往“扫描至”更换可访问的扫描目录再进行扫描。 diff --git a/app/scanner/mainwindow.cpp b/app/scanner/mainwindow.cpp index 57597fe9..f42b7187 100644 --- a/app/scanner/mainwindow.cpp +++ b/app/scanner/mainwindow.cpp @@ -1122,7 +1122,7 @@ void MainWindow::on_export_scanned_image(void) void MainWindow::on_continueScan() { - if(!isLimitAccessFolder()) + if(!isLimitAccessFolder("")) { return; } @@ -2879,7 +2879,7 @@ void MainWindow::on_act_scannerSettings_triggered() void MainWindow::on_act_acquire_triggered() { - if(!isLimitAccessFolder()) + if(!isLimitAccessFolder("")) { return; } @@ -2952,7 +2952,7 @@ void MainWindow::on_act_acquire_triggered() void MainWindow::on_act_acquireSingle_triggered() { - if(!isLimitAccessFolder()) + if(!isLimitAccessFolder("")) { return; } @@ -3025,11 +3025,6 @@ void MainWindow::on_act_acquireSingle_triggered() void MainWindow::on_act_acquireInto_triggered() { - if(!isLimitAccessFolder()) - { - return; - } - if (!cur_dev_.is_online() || m_isScanning) { return; @@ -3063,6 +3058,12 @@ void MainWindow::on_act_acquireInto_triggered() // m_aquireIntoSaveParam.m_savePath = getStdFileName(m_aquireIntoSaveParam.m_savePath + dateTime.toString("yyyyMMddhhmmss") + "/"); + + if(!isLimitAccessFolder(m_aquireIntoSaveParam.m_savePath)) + { + return; + } + if (!startSpaceCheck(this)) { m_dialogLog->updateStatus(cur_dev_.is_online() && 0 != m_scanType, m_isScanning); @@ -3114,7 +3115,7 @@ void MainWindow::on_act_acquireInto_triggered() void MainWindow::on_act_insertFromScanner_triggered() { - if(!isLimitAccessFolder()) + if(!isLimitAccessFolder("")) { return; } @@ -3479,7 +3480,7 @@ void MainWindow::upgradeApp(QString pkgPath) } } -bool MainWindow::isLimitAccessFolder() +bool MainWindow::isLimitAccessFolder(QString filePath) { HGChar documentsPath[512]; HGBase_GetDocumentsPath(documentsPath, 512); @@ -3495,6 +3496,25 @@ bool MainWindow::isLimitAccessFolder() HGResult result = HGBase_CreateDir(getStdString(documentsPath).c_str()); if(result != HGBASE_ERR_OK) { + if(!filePath.isEmpty()) + { + HGChar uuid2[512]; + HGBase_GetUuid(uuid2, 512); + filePath += uuid2; + HGResult result = HGBase_CreateDir(getStdString(filePath).c_str()); + if (result != 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; + } QMessageBox::critical(this, tr("error"), tr("folder limit")); m_dialogLog->addLog(tr("folder limit"), true); m_wndStatusBar->setDeviceStatusInfo(tr("folder limit"), true); diff --git a/app/scanner/mainwindow.h b/app/scanner/mainwindow.h index 8e37005a..57da294d 100644 --- a/app/scanner/mainwindow.h +++ b/app/scanner/mainwindow.h @@ -238,7 +238,7 @@ private: bool open_scanner(const QString& name, OPTSCHEME* schm); bool judgeDiskSpace(QString currentPath); void upgradeApp(QString pkgPath); - bool isLimitAccessFolder(); + bool isLimitAccessFolder(QString filePath); private: Ui::MainWindow *ui;