Merge pull request  from shenmo/lts-3.5
This commit is contained in:
shenmo 2022-12-10 12:54:35 +00:00 committed by Gitee
commit 7390e292ae
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 18 additions and 4 deletions

7
debian/changelog vendored

@ -1,3 +1,10 @@
spark-store (3.5.1) stable; urgency=medium
* fix: 搜索修复在appinfo界面可以正常搜索
-- shenmo <shenmo@spark-app.store> Fri, 30 Jan 2022 00:00:00 +0800
spark-store (3.5) stable; urgency=medium spark-store (3.5) stable; urgency=medium
* feat: 搜索转为使用网页,提高加载速度和用户体验 * feat: 搜索转为使用网页,提高加载速度和用户体验

@ -20,7 +20,7 @@ DWIDGET_USE_NAMESPACE
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
// Get build time // Get build time
static const QString version = "Version 3.5"; static const QString version = "Version 3.5.1";
static const QDate buildDate = QLocale( QLocale::English ).toDate( QString(__DATE__).replace(" ", " 0"), "MMM dd yyyy"); static const QDate buildDate = QLocale( QLocale::English ).toDate( QString(__DATE__).replace(" ", " 0"), "MMM dd yyyy");
static const QTime buildTime = QTime::fromString(__TIME__, "hh:mm:ss"); static const QTime buildTime = QTime::fromString(__TIME__, "hh:mm:ss");

@ -789,8 +789,10 @@ void Widget::searchApp(QString text)
}else{ }else{
ui->webEngineView->setUrl(serverUrl + "store/#/darksearch?keywords=" + text); ui->webEngineView->setUrl(serverUrl + "store/#/darksearch?keywords=" + text);
} }
ui->stackedWidget->setCurrentIndex(0);
// spinner->stop(); // spinner->stop();
// spinner->hide(); // spinner->hide();
ui->stackedWidget->setCurrentIndex(0);
mutex.unlock(); mutex.unlock();
@ -1238,10 +1240,15 @@ void Widget::on_pushButton_clearWebCache_clicked()
{ {
QtConcurrent::run([=]() QtConcurrent::run([=]()
{ {
QString dataLocal = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation); QString dataLocal = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation);
QDir cacheDir(dataLocal ); qDebug() << dataLocal;
cacheDir.removeRecursively(); }); QDir dataDir(dataLocal);
dataDir.removeRecursively();
dataLocal = QStandardPaths::writableLocation(QStandardPaths::TempLocation);
qDebug() << dataLocal;
QDir cacheDir(dataLocal);
cacheDir.removeRecursively();
});
} }
quint64 Widget::dirFileSize(const QString &path) quint64 Widget::dirFileSize(const QString &path)