From 2bb4feec43a61d5ed36e2f6caf5aae63ae0c0cca Mon Sep 17 00:00:00 2001 From: shenmo Date: Fri, 21 Aug 2020 17:29:05 +0800 Subject: [PATCH 1/4] =?UTF-8?q?7+2=E2=80=94=E2=80=94=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=E6=BA=90=E6=9C=8D=E5=8A=A1=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.cpp | 2 +- spark-store.pro.user | 325 ------------------------------------------- widget.cpp | 2 +- widget.ui | 6 +- 4 files changed, 5 insertions(+), 330 deletions(-) delete mode 100644 spark-store.pro.user diff --git a/main.cpp b/main.cpp index 8d5d97e..f66023d 100644 --- a/main.cpp +++ b/main.cpp @@ -16,7 +16,7 @@ int main(int argc, char *argv[]) a.setProductIcon(QIcon::fromTheme("spark-store")); //设置Logo a.setProductName("Spark应用商店"); - a.setApplicationDescription("深度社区驱动的一款为deepin打造的第三方商店"); + a.setApplicationDescription("社区驱动的一款为第三方应用商店，为改变而生"); a.setApplicationName("Spark应用商店"); //只有在这儿修改窗口标题才有效 Widget w; QDesktopWidget *s=DApplication::desktop(); diff --git a/spark-store.pro.user b/spark-store.pro.user deleted file mode 100644 index b02f53e..0000000 --- a/spark-store.pro.user +++ /dev/null @@ -1,325 +0,0 @@ - - - - - - EnvironmentId - {2b2d2f1a-6483-4add-a570-55e1f0a2e40a} - - - ProjectExplorer.Project.ActiveTarget - 0 - - - ProjectExplorer.Project.EditorSettings - - true - false - true - - Cpp - - CppGlobal - - - - QmlJS - - QmlJSGlobal - - - 2 - UTF-8 - false - 4 - false - 80 - true - true - 1 - true - false - 0 - true - true - 0 - 8 - true - 1 - true - true - true - false - - - - ProjectExplorer.Project.PluginSettings - - - true - - - - ProjectExplorer.Project.Target.0 - - 桌面 - 桌面 - {a42d4e65-62ab-4574-9a07-1c933c50ac5d} - 0 - 0 - 0 - - /home/maicss/git/spark/build-spark-store-unknown-Debug - - - true - qmake - - QtProjectManager.QMakeBuildStep - true - - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - true - - - /home/maicss/git/spark/build-spark-store-unknown-Release - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - - false - false - true - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - - /home/maicss/git/spark/build-spark-store-unknown-Profile - - - true - qmake - - QtProjectManager.QMakeBuildStep - true - - false - true - true - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Profile - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - 3 - - - 0 - 部署 - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy Configuration - - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - 2 - - - Custom Executable - - ProjectExplorer.CustomExecutableRunConfiguration - - 3768 - false - true - false - false - true - - - - 1 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.FileVersion - 20 - - - Version - 20 - - diff --git a/widget.cpp b/widget.cpp index 75277cf..45494c8 100644 --- a/widget.cpp +++ b/widget.cpp @@ -213,7 +213,7 @@ void Widget::initConfig() ui->comboBox_server->setCurrentText(readConfig.value("server/choose").toString()); serverUrl=readConfig.value("server/choose").toString(); }else { - serverUrl="http://store.jerrywang.top/";//默认URL + serverUrl="http://store.jerrywang.top/amd64/";//默认URL } configCanSave=true; //防止出发保存配置信号 menuUrl[0]=serverUrl + "store/#/"; diff --git a/widget.ui b/widget.ui index fec4597..f6496cb 100644 --- a/widget.ui +++ b/widget.ui @@ -675,7 +675,7 @@ 0 0 - 901 + 404 849 @@ -971,7 +971,7 @@ 0 0 - 867 + 370 325 @@ -1198,7 +1198,7 @@ color:#808080 - <html><head/><body><p>源服务器的作用是保证软件更新，并且支持使用apt工具获取软件。通常我们更建议你使用第一个线路作为更新源。虽然它可能偶尔有些慢。</p></body></html> + <html><head/><body><p>源服务器的作用是保证软件更新，并且支持使用apt工具获取软件。通常我们更建议你使用第一个线路作为更新源，一般是最稳定的</p></body></html> true From 4138c5d6346b8035275d225dba00e12f2e649cd7 Mon Sep 17 00:00:00 2001 From: shenmo Date: Sat, 22 Aug 2020 09:38:49 +0800 Subject: [PATCH 2/4] bug --- spark-store.pro.user | 326 +++++++++++++++++++++++++++++++++++++++++++ widget.cpp | 3 +- 2 files changed, 328 insertions(+), 1 deletion(-) create mode 100644 spark-store.pro.user diff --git a/spark-store.pro.user b/spark-store.pro.user new file mode 100644 index 0000000..5e5effc --- /dev/null +++ b/spark-store.pro.user @@ -0,0 +1,326 @@ + + + + + + EnvironmentId + {1ded0e97-2225-4a41-9802-7d9fc8cf19ee} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + true + + + + ProjectExplorer.Project.Target.0 + + 桌面 + 桌面 + {0bdfdfd6-91e4-4691-ae05-762944814796} + 0 + 0 + 0 + + /home/deepin/Desktop/build-spark-store-unknown-Debug + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + /home/deepin/Desktop/build-spark-store-unknown-Release + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + + /home/deepin/Desktop/build-spark-store-unknown-Profile + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 3 + + + 0 + 部署 + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy Configuration + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + spark-store + + Qt4ProjectManager.Qt4RunConfiguration:/home/deepin/Desktop/spark-store/spark-store.pro + spark-store.pro + + 3768 + false + true + true + false + false + true + + /home/deepin/Desktop/build-spark-store-unknown-Debug + + 1 + + + + ProjectExplorer.Project.TargetCount + 1 + + + ProjectExplorer.Project.Updater.FileVersion + 20 + + + Version + 20 + + diff --git a/widget.cpp b/widget.cpp index 45494c8..1a0779e 100644 --- a/widget.cpp +++ b/widget.cpp @@ -213,8 +213,9 @@ void Widget::initConfig() ui->comboBox_server->setCurrentText(readConfig.value("server/choose").toString()); serverUrl=readConfig.value("server/choose").toString(); }else { - serverUrl="http://store.jerrywang.top/amd64/";//默认URL + serverUrl="http://store.jerrywang.top/";//默认URL } + //by shenmo 在这里换成路径为{cdn/dc}/store/# configCanSave=true; //防止出发保存配置信号 menuUrl[0]=serverUrl + "store/#/"; // menuUrl[0]="http://127.0.0.1:8000/#/darkprogramming"; From e7276662f4ecbd8735ec50cd5b61d42fb94c7619 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=A4=A9=E6=80=BF?= Date: Sun, 23 Aug 2020 20:11:02 +0800 Subject: [PATCH 3/4] Add new server Change default serverURL for better usage exxperience. --- README.md | 6 +- spark-store.pro.user | 326 ------------------------------------------- widget.cpp | 205 ++++++++++++--------------- 3 files changed, 93 insertions(+), 444 deletions(-) delete mode 100644 spark-store.pro.user diff --git a/README.md b/README.md index de06c93..ed90f50 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,10 @@ web页面部分正在开发当中，详情请见[web仓库](https://gitee.com/de 当前服务器线路列表（项目中包含）： ``` -http://dcstore.shenmo.tech/ +http://cdn.jerrywang.top/ +http://sucdn.jerrywang.top/ http://store.jerrywang.top/ +http://dcstore.shenmo.tech/ ``` #### 参数 @@ -25,7 +27,7 @@ http://store.jerrywang.top/ 可选的web分类： -| 分类名称 | web分类 | +| 分类名称 | web分类 　 | | -------- | -------------- | | 网络应用 | network | | 社交沟通 | chat | diff --git a/spark-store.pro.user b/spark-store.pro.user deleted file mode 100644 index 5e5effc..0000000 --- a/spark-store.pro.user +++ /dev/null @@ -1,326 +0,0 @@ - - - - - - EnvironmentId - {1ded0e97-2225-4a41-9802-7d9fc8cf19ee} - - - ProjectExplorer.Project.ActiveTarget - 0 - - - ProjectExplorer.Project.EditorSettings - - true - false - true - - Cpp - - CppGlobal - - - - QmlJS - - QmlJSGlobal - - - 2 - UTF-8 - false - 4 - false - 80 - true - true - 1 - true - false - 0 - true - true - 0 - 8 - true - 1 - true - true - true - false - - - - ProjectExplorer.Project.PluginSettings - - - true - - - - ProjectExplorer.Project.Target.0 - - 桌面 - 桌面 - {0bdfdfd6-91e4-4691-ae05-762944814796} - 0 - 0 - 0 - - /home/deepin/Desktop/build-spark-store-unknown-Debug - - - true - qmake - - QtProjectManager.QMakeBuildStep - true - - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - true - - - /home/deepin/Desktop/build-spark-store-unknown-Release - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - - false - false - true - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - - /home/deepin/Desktop/build-spark-store-unknown-Profile - - - true - qmake - - QtProjectManager.QMakeBuildStep - true - - false - true - true - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Profile - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - 3 - - - 0 - 部署 - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy Configuration - - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - 2 - - spark-store - - Qt4ProjectManager.Qt4RunConfiguration:/home/deepin/Desktop/spark-store/spark-store.pro - spark-store.pro - - 3768 - false - true - true - false - false - true - - /home/deepin/Desktop/build-spark-store-unknown-Debug - - 1 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.FileVersion - 20 - - - Version - 20 - - diff --git a/widget.cpp b/widget.cpp index 1a0779e..c048ba2 100644 --- a/widget.cpp +++ b/widget.cpp @@ -13,7 +13,7 @@ #include #include #include -#include //并发 +#include // 并发 #include #include #include @@ -36,7 +36,7 @@ Widget::Widget(DBlurEffectWidget *parent) : ui->setupUi(this); initUI(); initConfig(); - manager = new QNetworkAccessManager(this);//下载管理 + manager = new QNetworkAccessManager(this); // 下载管理 connect(ui->menu_main,&QPushButton::clicked,[=](){Widget::chooseLeftMenu(0);}); connect(ui->menu_network,&QPushButton::clicked,[=](){Widget::chooseLeftMenu(1);}); @@ -52,10 +52,9 @@ Widget::Widget(DBlurEffectWidget *parent) : connect(ui->menu_theme,&QPushButton::clicked,[=](){Widget::chooseLeftMenu(11);}); connect(ui->menu_other,&QPushButton::clicked,[=](){Widget::chooseLeftMenu(12);}); connect(ui->menu_download,&QPushButton::clicked,[=](){Widget::chooseLeftMenu(13);}); -// connect((ui->titlebar)) + // connect((ui->titlebar)) - - //搜索事件 + // 搜索事件 connect(searchEdit,&DSearchEdit::editingFinished,this,[=](){ QString searchtext=searchEdit->text(); if(searchtext!=""){ @@ -65,6 +64,7 @@ Widget::Widget(DBlurEffectWidget *parent) : searchEdit->clearEdit(); }); + connect(DGuiApplicationHelper::instance(), &DGuiApplicationHelper::themeTypeChanged, this, [=](DGuiApplicationHelper::ColorType themeType) { QColor main_color; main_color=DGuiApplicationHelper::instance()->applicationPalette().highlight().color(); @@ -77,7 +77,7 @@ Widget::Widget(DBlurEffectWidget *parent) : } }); - //计算显示下载速度 + // 计算显示下载速度 download_speed.setInterval(1000); download_speed.start(); connect(&download_speed,&QTimer::timeout,[=](){ @@ -101,16 +101,16 @@ Widget::Widget(DBlurEffectWidget *parent) : }); } - Widget::~Widget() { delete ui; qDebug()<<"exit"; DApplication::quit(); } + void Widget::initUI() { - //ui初始化 + // ui初始化 setMaskAlpha(220); ui->webfoot->setFixedHeight(0); ui->stackedWidget->setCurrentIndex(0); @@ -121,41 +121,37 @@ void Widget::initUI() ui->icon->setPixmap(QIcon::fromTheme("spark-store").pixmap(36,36)); ui->titlebar->setFixedHeight(50); - - - //初始化分界线 + // 初始化分界线 QGraphicsOpacityEffect *opacityEffect_1=new QGraphicsOpacityEffect; opacityEffect_1->setOpacity(0.1); ui->line1_widget->setGraphicsEffect(opacityEffect_1); - - - //搜索框 + // 搜索框 QWidget *w_titlebar=new QWidget; QHBoxLayout *ly_titlebar=new QHBoxLayout; w_titlebar->setLayout(ly_titlebar); -// ly_titlebar->addWidget(ui->pushButton_return); + // ly_titlebar->addWidget(ui->pushButton_return); ly_titlebar->addStretch(); ly_titlebar->addSpacing(50); ly_titlebar->addWidget(searchEdit); ly_titlebar->addStretch(); titlebar=ui->titlebar; titlebar->setCustomWidget(w_titlebar); -// titlebar->setIcon(QIcon::fromTheme("spark-store")); + // titlebar->setIcon(QIcon::fromTheme("spark-store")); titlebar->setTitle("星火应用商店"); searchEdit->setPlaceholderText("搜索或打开链接"); searchEdit->setFixedWidth(300); titlebar->setSeparatorVisible(false); -// titlebar->setAutoHideOnFullscreen(true); + // titlebar->setAutoHideOnFullscreen(true); - //添加菜单项 + // 添加菜单项 QAction *setting=new QAction("设置"); QMenu *menu=new QMenu; menu->addAction(setting); titlebar->setMenu(menu); connect(setting,&QAction::triggered,this,&Widget::opensetting); - //初始化菜单数组 + // 初始化菜单数组 left_list[0]=ui->menu_main; left_list[1]=ui->menu_network; left_list[2]=ui->menu_chat; @@ -171,8 +167,7 @@ void Widget::initUI() left_list[12]=ui->menu_other; left_list[13]=ui->menu_download; - - //初始化web加载动画 + // 初始化web加载动画 QHBoxLayout *m_weblayout=new QHBoxLayout; m_weblayout->addWidget(m_loadweb); m_weblayout->addWidget(m_loaderror); @@ -186,14 +181,14 @@ void Widget::initUI() m_loaderror->setAlignment(Qt::AlignCenter); ui->webView->setLayout(m_weblayout); -// ui->stackedWidget->setLayout(m_weblayout); + // ui->stackedWidget->setLayout(m_weblayout); ui->label_show->hide(); } void Widget::initConfig() { - //读取服务器列表并初始化 + // 读取服务器列表并初始化 std::fstream serverList; serverList.open(QDir::homePath().toUtf8()+"/.config/spark-store/server.list",std::ios::in); std::string lineTmp; @@ -202,23 +197,21 @@ void Widget::initConfig() ui->comboBox_server->addItem(QString::fromStdString(lineTmp)); } }else { - ui->comboBox_server->addItem("http://store.jerrywang.top/"); + ui->comboBox_server->addItem("http://sucdn.jerrywang.top/"); } - - - //读取服务器URL并初始化菜单项的链接 + // 读取服务器URL并初始化菜单项的链接 QSettings readConfig(QDir::homePath()+"/.config/spark-store/config.ini",QSettings::IniFormat); if(readConfig.value("server/choose").toString()!=""){ ui->comboBox_server->setCurrentText(readConfig.value("server/choose").toString()); serverUrl=readConfig.value("server/choose").toString(); }else { - serverUrl="http://store.jerrywang.top/";//默认URL + serverUrl="http://sucdn.jerrywang.top/"; // 默认URL } - //by shenmo 在这里换成路径为{cdn/dc}/store/# - configCanSave=true; //防止出发保存配置信号 + // by shenmo 在这里换成路径为{cdn/dc}/store/# + configCanSave=true; //　防止触发保存配置信号 menuUrl[0]=serverUrl + "store/#/"; -// menuUrl[0]="http://127.0.0.1:8000/#/darkprogramming"; + // menuUrl[0]="http://127.0.0.1:8000/#/darkprogramming"; menuUrl[1]=serverUrl + "store/#/network"; menuUrl[2]=serverUrl + "store/#/relations"; menuUrl[3]=serverUrl + "store/#/musicandsound"; @@ -232,13 +225,12 @@ void Widget::initConfig() menuUrl[11]=serverUrl + "store/#/themes"; menuUrl[12]=serverUrl + "store/#/others"; - - //web控件初始化 + // web控件初始化 ui->webView->page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks); //用来激活接受linkClicked信号 ui->webView->page()->settings()->setAttribute(QWebSettings::JavascriptEnabled,true); ui->webfoot->hide(); - //初始化首页 + // 初始化首页 ui->webView->setUrl(menuUrl[0]); chooseLeftMenu(0); @@ -247,7 +239,7 @@ void Widget::initConfig() download_list[i].num=i; } - //初始化apt源显示 + // 初始化apt源显示 QFile aptserver("/etc/apt/sources.list.d/sparkstore.list"); aptserver.open(QIODevice::ReadOnly); if(aptserver.isOpen()){ @@ -257,14 +249,16 @@ void Widget::initConfig() } aptserver.close(); - //新建临时文件夹 + // 新建临时文件夹 QDir dir("/tmp"); dir.mkdir("spark-store"); } + void Widget::setTheme(bool isDark,QColor color) { + // 菜单图标 if(isDark){ - //黑色模式 + // 黑色模式 themeIsDark=true; ui->webView->setStyleSheet("background-color:#282828"); ui->btn_openDir->setStyleSheet("color:#8B91A1;background-color:#2E2F30;border:0px"); @@ -273,11 +267,8 @@ void Widget::setTheme(bool isDark,QColor color) ui->scrollArea->setStyleSheet("#scrollArea{background-color:#252525}"); ui->label_show->setStyleSheet("background-color:#252525"); ui->pushButton_return->setIcon(QIcon(":/icons/icons/category_active_dark.svg")); - //菜单图标 - - }else { - //亮色模式 + // 亮色模式 themeIsDark=false; ui->webView->setStyleSheet("background-color:#FFFFFF"); ui->webfoot->setStyleSheet("background-color:#FFFFFF"); @@ -286,7 +277,6 @@ void Widget::setTheme(bool isDark,QColor color) ui->scrollArea->setStyleSheet("#scrollArea{background-color:#F8F8F8}"); ui->label_show->setStyleSheet("background-color:#F8F8F8"); ui->pushButton_return->setIcon(QIcon(":/icons/icons/category_active.svg")); - } main_color=color; @@ -309,27 +299,28 @@ void Widget::on_webView_loadStarted() m_loaderror->hide(); ui->label_show->hide(); - //分析出服务器中的分类名称 + // 分析出服务器中的分类名称 QUrl arg1=ui->webView->page()->mainFrame()->requestedUrl().toString(); QStringList url_=arg1.path().split("/"); if(url_.size()>3){ type_name=url_[2]; } - //如果是app.json就打开详情页 + // 如果是app.json就打开详情页 if(arg1.path().right(8)=="app.json"){ - load.cancel();//打开并发加载线程前关闭正在执行的线程 + load.cancel(); // 打开并发加载线程前关闭正在执行的线程 - ui->label_more->setText("");//清空详情介绍 + ui->label_more->setText(""); // 清空详情介绍 ui->label_info->setText(""); ui->label_appname->setText(""); ui->pushButton_download->setEnabled(false); ui->stackedWidget->setCurrentIndex(2); - load.cancel();//打开并发加载线程前关闭正在执行的线程 + load.cancel(); // 打开并发加载线程前关闭正在执行的线程 load = QtConcurrent::run([=](){ loadappinfo(arg1); }); } } + void Widget::updateUI() { if(themeIsDark){ @@ -418,14 +409,13 @@ void Widget::updateUI() break; } } -//菜单切换逻辑 +// 菜单切换逻辑 void Widget::chooseLeftMenu(int index) { - nowMenu=index; -// setfoot(); -// updatefoot(); + // setfoot(); + // updatefoot(); updateUI(); left_list[index]->setStyleSheet("color:#FFFFFF;background-color:"+main_color.name()+";border-radius:8;border:0px"); @@ -448,7 +438,6 @@ void Widget::chooseLeftMenu(int index) }else if (index==13) { ui->stackedWidget->setCurrentIndex(1); } - } void Widget::setfoot(int h) @@ -462,22 +451,20 @@ void Widget::updatefoot() ui->webfoot->setFixedHeight(allh-foot); } - void Widget::loadappinfo(QUrl arg1) { - if(arg1.isEmpty()){ return; } - //先隐藏详情页负责显示截图的label + //　先隐藏详情页负责显示截图的label ui->screen_0->hide(); ui->screen_1->hide(); ui->screen_2->hide(); ui->screen_3->hide(); ui->screen_4->hide(); - //置UI状态 + //　重置UI状态 ui->pushButton_uninstall->hide(); ui->label_show->setText("正在加载，请稍候"); ui->label_show->show(); @@ -492,22 +479,22 @@ void Widget::loadappinfo(QUrl arg1) get_json.waitForFinished(); QFile app_json("app.json"); if(app_json.open(QIODevice::ReadOnly)){ - // //成功得到json文件 + // 成功得到json文件 QByteArray json_array=app_json.readAll(); - //将路径转化为相应源的下载路径 + // 将路径转化为相应源的下载路径 urladdress=arg1.toString().left(arg1.toString().length()-8); QStringList downloadurl=urladdress.split("/"); urladdress=ui->comboBox_server->currentText(); QString deburl=urladdress; deburl=deburl.left(urladdress.length()-1); - urladdress="http://img.shenmo.tech:38324/";//使用图片专用服务器请保留这行，删除后将使用源服务器 + urladdress="http://img.shenmo.tech:38324/"; // 使用图片专用服务器请保留这行，删除后将使用源服务器 urladdress=urladdress.left(urladdress.length()-1); for (int i=3;ilabel_appname->setText(appName); system("rm -r *.png"); ui->label_show->show(); - //软件信息加载 + // 软件信息加载 QString info; info="包名： "+json["Pkgname"].toString()+"\n"; info+="版本号： "+json["Version"].toString()+"\n"; @@ -545,14 +532,14 @@ void Widget::loadappinfo(QUrl arg1) }else { ui->pushButton_download->setText("安装"); } - //图标加载 + // 图标加载 get_json.start("curl -o icon.png "+urladdress+"icon.png"); get_json.waitForFinished(); QPixmap appicon(QString::fromUtf8(TMP_PATH)+"/icon.png"); ui->label_appicon->setPixmap(appicon); ui->pushButton_download->setEnabled(true); - //截图展示加载 + // 截图展示加载 image_show *label_screen[5]; label_screen[0]=ui->screen_0; label_screen[1]=ui->screen_1; @@ -565,7 +552,7 @@ void Widget::loadappinfo(QUrl arg1) if(screen[i].load("screen_"+QString::number(i+1)+".png")){ label_screen[i]->setImage(screen[i]); label_screen[i]->show(); - switch(i){ //故意为之，为了清除多余截图 + switch(i){ // 故意为之，为了清除多余截图 case 0: label_screen[1]->hide(); case 1: @@ -582,20 +569,15 @@ void Widget::loadappinfo(QUrl arg1) } ui->label_show->setText(""); ui->label_show->hide(); - } - } - - - void Widget::on_pushButton_download_clicked() { chooseLeftMenu(13); allDownload+=1; QFileInfo info(url.path()); - QString fileName(info.fileName()); //获取文件名 + QString fileName(info.fileName()); // 获取文件名 download_list[allDownload-1].pkgName=pkgName; if(fileName.isEmpty()) { @@ -622,7 +604,7 @@ void Widget::on_pushButton_download_clicked() return ; } nowDownload+=1; - startRequest(urList.at(nowDownload-1)); //进行链接请求 + startRequest(urList.at(nowDownload-1)); // 进行链接请求 } if(ui->pushButton_download->text()=="重新安装"){ download_list[allDownload-1].reinstall=true; @@ -640,7 +622,6 @@ void Widget::startRequest(QUrl url) connect(reply,SIGNAL(finished()),this,SLOT(httpFinished())); connect(reply,SIGNAL(readyRead()),this,SLOT(httpReadyRead())); connect(reply,SIGNAL(downloadProgress(qint64,qint64)),this,SLOT(updateDataReadProgress(qint64,qint64))); - } void Widget::searchApp(QString text) @@ -649,14 +630,11 @@ void Widget::searchApp(QString text) openUrl(text); }else { system("notify-send 目前仅支持商店专用链接的打开，搜索功能正在开发，请期待以后的版本！ --icon=spark-store"); -// ui->webView->setUrl(QUrl("http://www.baidu.com/s?wd="+text)); -// ui->stackedWidget->setCurrentIndex(0); - + // ui->webView->setUrl(QUrl("http://www.baidu.com/s?wd="+text)); + // ui->stackedWidget->setCurrentIndex(0); } - } - void Widget::httpReadyRead() { if(file) @@ -664,20 +642,20 @@ void Widget::httpReadyRead() file->write(reply->readAll()); } } + void Widget::updateDataReadProgress(qint64 bytesRead, qint64 totalBytes) { - download_list[nowDownload-1].setMax(10000); //最大值 - download_list[nowDownload-1].setValue((bytesRead*10000)/totalBytes); //当前值 + download_list[nowDownload-1].setMax(10000); // 最大值 + download_list[nowDownload-1].setValue((bytesRead*10000)/totalBytes); // 当前值 download_size=bytesRead; - if(download_list[nowDownload-1].close){ //随时检测下载是否被取消 + if(download_list[nowDownload-1].close){ // 随时检测下载是否被取消 download_list[nowDownload-1].closeDownload(); httpFinished(); } } -void Widget::httpFinished() //完成下载 +void Widget::httpFinished() // 完成下载 { - file->flush(); file->close(); reply->deleteLater(); @@ -688,7 +666,7 @@ void Widget::httpFinished() //完成下载 isBusy=false; download_list[nowDownload-1].readyInstall(); download_list[nowDownload-1].free=true; - if(nowDownloadstackedWidget->setCurrentIndex(0); -// if(nowMenu==13){ -// chooseLeftMenu(13); -// return; -// } + // ui->stackedWidget->setCurrentIndex(0); + // if(nowMenu==13){ + // chooseLeftMenu(13); + // return; + // } chooseLeftMenu(nowMenu); -// if(themeIsDark){ -// QString darkurl=menuUrl[nowMenu].toString(); -// QStringList tmp=darkurl.split("/"); -// darkurl.clear(); -// for (int i=0;iwebView->setUrl(darkurl); -// qDebug()<webView->setUrl(menuUrl[nowMenu]); -// } + // if(themeIsDark){ + // QString darkurl=menuUrl[nowMenu].toString(); + // QStringList tmp=darkurl.split("/"); + // darkurl.clear(); + // for (int i=0;iwebView->setUrl(darkurl); + // qDebug()<webView->setUrl(menuUrl[nowMenu]); + // } } void Widget::on_comboBox_server_currentIndexChanged(const QString &arg1) @@ -738,6 +714,7 @@ void Widget::on_comboBox_server_currentIndexChanged(const QString &arg1) setConfig->setValue("server/choose",arg1); } } + void Widget::on_pushButton_updateServer_clicked() { QtConcurrent::run([=](){ @@ -753,7 +730,7 @@ void Widget::on_pushButton_updateServer_clicked() ui->comboBox_server->addItem(QString::fromStdString(lineTmp)); } }else { - ui->comboBox_server->addItem("http://store.jerrywang.top/"); + ui->comboBox_server->addItem("http://sucdn.jerrywang.top/"); } ui->pushButton_updateServer->setEnabled(true); ui->comboBox_server->setCurrentIndex(0); @@ -820,7 +797,7 @@ void Widget::on_pushButton_uninstall_clicked() }); } -void Widget::on_pushButton_clear_clicked()//清空临时缓存目录 +void Widget::on_pushButton_clear_clicked() // 清空临时缓存目录 { QtConcurrent::run([=](){ ui->pushButton_clear->setEnabled(false); @@ -840,16 +817,16 @@ quint64 Widget::dirFileSize(const QString &path) { QDir dir(path); quint64 size = 0; - //dir.entryInfoList(QDir::Files)返回文件信息 + // dir.entryInfoList(QDir::Files)返回文件信息 foreach(QFileInfo fileInfo, dir.entryInfoList(QDir::Files)) { - //计算文件大小 + // 计算文件大小 size += quint64(fileInfo.size()); } - //dir.entryList(QDir::Dirs|QDir::NoDotAndDotDot)返回所有子目录，并进行过滤 + // dir.entryList(QDir::Dirs|QDir::NoDotAndDotDot)返回所有子目录，并进行过滤 foreach(QString subDir, dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot)) { - //若存在子目录，则递归调用dirFileSize()函数 + // 若存在子目录，则递归调用dirFileSize()函数 size += dirFileSize(path + QDir::separator() + subDir); } return size; @@ -857,13 +834,13 @@ quint64 Widget::dirFileSize(const QString &path) void Widget::opensetting() { - //防止下载时文件被删除 + // 防止下载时文件被删除 if(isdownload){ ui->pushButton_clear->setEnabled(false); }else { ui->pushButton_clear->setEnabled(true); } - //显示缓存占用空间 + // 显示缓存占用空间 quint64 tmp_size=dirFileSize(QString::fromUtf8(TMP_PATH)); QString tmp_size_str; if(tmp_size<1024){ @@ -885,18 +862,15 @@ void Widget::openUrl(QUrl u) ui->webView->setUrl(app); } - - void Widget::on_pushButton_website_clicked() { QDesktopServices::openUrl(QUrl(appweb)); } - void Widget::on_webView_loadFinished(bool arg1) { if(arg1){ - m_loadweb->hide(); + m_loadweb->hide(); }else { m_loadweb->hide(); m_loaderror->show(); @@ -924,7 +898,6 @@ void Widget::on_pushButton_clicked() void Widget::on_btn_openDir_clicked() { - QDesktopServices::openUrl(QUrl("file:///tmp/spark-store", QUrl::TolerantMode)); } From 7af2af64d86d0940fc60b7061485e44e2b2b4f59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=A4=A9=E6=80=BF?= Date: Mon, 24 Aug 2020 12:44:03 +0800 Subject: [PATCH 4/4] Update image server Change image server. --- widget.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/widget.cpp b/widget.cpp index c048ba2..bb76355 100644 --- a/widget.cpp +++ b/widget.cpp @@ -487,7 +487,7 @@ void Widget::loadappinfo(QUrl arg1) urladdress=ui->comboBox_server->currentText(); QString deburl=urladdress; deburl=deburl.left(urladdress.length()-1); - urladdress="http://img.shenmo.tech:38324/"; // 使用图片专用服务器请保留这行，删除后将使用源服务器 + urladdress="http://img.jerrywang.top/"; // 使用图片专用服务器请保留这行，删除后将使用源服务器 urladdress=urladdress.left(urladdress.length()-1); for (int i=3;i