更新readme

提交者：沫 <jifengshenmo@outlook.com>
	修改：     downloadlist.cpp
	修改：     downloadlist.h
	修改：     downloadlist.ui
	新文件：   server.list
	修改：     widget.cpp
	修改：     widget.h
	修改：     widget.ui

README.md

@@ -1,14 +1,17 @@
-# deepin-community-store
+# 深度社区应用商店
 
 #### 介绍
 deepin社区商店，由社区维护
-web页面部分正在开发当中
+web页面部分正在开发当中，详情请见[web仓库](https://gitee.com/deepin-community-store/DCSAPP_WEB)
+#### 编译指导
+依赖：dtk2版（适用于ubuntu/15.11)：qt5-default g++ libdtkcore2-dev libdtkwidget2-dev libqt5webkit5-dev libdtkgui2-dev
+     dtk5版（适用于20beta):qt5-default g++ libdtkwidget5-dev libdtkcore5-dev libdtkgui5-dev libqt5webkit5-dev
 
 #### 说明
 
 需要在运行目录下放置服务器线路列表`server.list`，每行一个，在末尾需要添加“/”
 
-当前服务器线路列表（直接复制到相应文件即可）：
+当前服务器线路列表（项目中包含）：
 
 ```
 http://dcstore.shenmo.tech/
@@ -17,6 +20,14 @@ http://store2.shenmo.tech/
 http://store.moshengren.xyz/
 ```
 
+ #### 目录结构
+
+安装软件过程中产生的包，图标，截图等被储存到`/tmp/deepin-community-store/`中。
+
+配置文件被储存到`~/.config/deepin-community-store/`中。
+
+线路文件：当前运行目录下的`./server.list`
+
 #### 参与贡献
 
 1.  Fork 本仓库

downloadlist.cpp

@@ -1,6 +1,12 @@
 #include "downloadlist.h"
 #include "ui_downloadlist.h"
 #include <QDebug>
+#include <QIcon>
+#include <QPixmap>
+#include <QtConcurrent>
+#include <QProcess>
+bool downloadlist::isInstall=false;
+
 downloadlist::downloadlist(QWidget *parent) :
     QWidget(parent),
     ui(new Ui::downloadlist)
@@ -9,6 +15,7 @@ downloadlist::downloadlist(QWidget *parent) :
     ui->pushButton->setEnabled(false);
     ui->progressBar->setValue(0);
     ui->label_filename->hide();
+    ui->pushButton->hide();
     ui->label->setStyleSheet("color:#000000");
 }
 
@@ -20,6 +27,10 @@ downloadlist::~downloadlist()
 void downloadlist::setValue(long long value)
 {
     ui->progressBar->setValue(value);
+    ui->label_2->setText(QString::number((double)value/100)+"%");
+    if(ui->label_2->text()=="100%"){
+        ui->label_2->setText("已完成，等待安装");
+    }
 }
 
 void downloadlist::setMax(long long max)
@@ -39,17 +50,23 @@ QString downloadlist::getName()
 
 void downloadlist::readyInstall()
 {
-    ui->progressBar->hide();
-    ui->pushButton->setEnabled(true);
-    system("notify-send \""+ui->label->text().toUtf8()+"下载完成，等待安装\"");
+    if(!close){
+        ui->progressBar->hide();
+        ui->pushButton->setEnabled(true);
+        ui->pushButton->show();
+        ui->pushButton_2->hide();
+        system("notify-send \""+ui->label->text().toUtf8()+"下载完成，等待安装\"" +" --icon=/tmp/deepin-community-store/icon_"+QString::number(num).toUtf8()+".png");
+    }
 }
 
 void downloadlist::choose(bool isChoosed)
 {
     if(isChoosed){
         ui->label->setStyleSheet("color:#FFFFFF");
+        ui->label_2->setStyleSheet("color:#FFFFFF");
     }else {
         ui->label->setStyleSheet("color:#000000");
+        ui->label_2->setStyleSheet("color:#000000");
     }
 }
 
@@ -58,8 +75,60 @@ void downloadlist::setFileName(QString fileName)
     ui->label_filename->setText(fileName);
 }
 
+void downloadlist::seticon(const QPixmap icon)
+{
+    ui->label_3->setPixmap(icon);
+}
+
+void downloadlist::closeDownload()
+{
+    on_pushButton_2_clicked();
+}
+
 void downloadlist::on_pushButton_clicked()
 {
-    system("x-terminal-emulator -e sudo apt install -y ./"+ui->label_filename->text().toUtf8());
-    qDebug()<<ui->label_filename->text().toUtf8();
+    if(!isInstall){
+        isInstall=true;
+        ui->pushButton->setEnabled(false);
+        ui->label_2->setText("正在安装，请稍候");
+        QtConcurrent::run([=](){
+            QProcess installer;
+            installer.start("pkexec apt install -y /tmp/deepin-community-store/"+ui->label_filename->text().toUtf8());
+            installer.waitForFinished();
+            QString error=QString::fromStdString(installer.readAllStandardError().toStdString());
+            QStringList everyError=error.split("\n");
+            bool haveError=false;
+            bool notRoot=false;
+            for (int i=0;i<everyError.size();i++) {
+                qDebug()<<everyError[i].left(2);
+                if(everyError[i].left(2)=="E:"){
+                    haveError=true;
+                }
+                if(everyError[i].right(14)=="Not authorized"){
+                    notRoot=true;
+                }
+            }
+            if(!haveError && !notRoot){
+                ui->pushButton->hide();
+                ui->label_2->setText("安装完成");
+            }else if(haveError){
+                ui->pushButton->hide();
+                ui->label_2->setText("安装出现错误");
+            }else {
+                ui->label_2->setText("安装被终止");
+            }
+            isInstall=false;
+        });
+    //    system("x-terminal-emulator -e sudo apt install -y ./"+ui->label_filename->text().toUtf8());
+        qDebug()<<ui->label_filename->text().toUtf8();
+    }
+
+}
+
+void downloadlist::on_pushButton_2_clicked()
+{
+    ui->label_2->setText("已取消下载");
+    ui->pushButton_2->setEnabled(false);
+    ui->progressBar->hide();
+    close=true;
 }

downloadlist.h

@@ -2,7 +2,6 @@
 #define DOWNLOADLIST_H
 
 #include <QWidget>
-
 namespace Ui {
 class downloadlist;
 }
@@ -22,13 +21,21 @@ public:
     void choose(bool);
     bool free;
     void setFileName(QString);
-public: signals:
+    void seticon(const QPixmap);
     void closeDownload();
+    int num;
+    bool close=false;
+
 private slots:
     void on_pushButton_clicked();
 
+    void on_pushButton_2_clicked();
+
+
 private:
     Ui::downloadlist *ui;
-};
+    static bool isInstall;
 
+};
+//bool downloadlist::isInstall=false;
 #endif // DOWNLOADLIST_H

downloadlist.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>636</width>
-    <height>52</height>
+    <width>744</width>
+    <height>54</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -17,14 +17,15 @@
    <string notr="true"/>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="3">
-    <widget class="QProgressBar" name="progressBar">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
+   <item row="0" column="1">
+    <widget class="QLabel" name="label_filename">
+     <property name="text">
+      <string>TextLabel</string>
      </property>
+    </widget>
+   </item>
+   <item row="0" column="4">
+    <widget class="QWidget" name="widget" native="true">
      <property name="minimumSize">
       <size>
        <width>350</width>
@@ -34,28 +35,111 @@
      <property name="maximumSize">
       <size>
        <width>500</width>
-       <height>10</height>
+       <height>16777215</height>
       </size>
      </property>
-     <property name="value">
-      <number>24</number>
-     </property>
-     <property name="textVisible">
-      <bool>false</bool>
-     </property>
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <property name="spacing">
+       <number>2</number>
+      </property>
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QProgressBar" name="progressBar">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>350</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>500</width>
+          <height>10</height>
+         </size>
+        </property>
+        <property name="value">
+         <number>24</number>
+        </property>
+        <property name="textVisible">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLabel" name="label_2">
+        <property name="font">
+         <font>
+          <pointsize>9</pointsize>
+         </font>
+        </property>
+        <property name="text">
+         <string>等待开始下载</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignCenter</set>
+        </property>
+       </widget>
+      </item>
+     </layout>
     </widget>
    </item>
-   <item row="0" column="5">
+   <item row="0" column="6">
+    <spacer name="horizontalSpacer_2">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="0" column="3">
+    <spacer name="horizontalSpacer">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Expanding</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>40</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="0" column="7">
     <widget class="QPushButton" name="pushButton">
      <property name="minimumSize">
       <size>
-       <width>80</width>
+       <width>60</width>
        <height>0</height>
       </size>
      </property>
      <property name="maximumSize">
       <size>
-       <width>80</width>
+       <width>60</width>
        <height>16777215</height>
       </size>
      </property>
@@ -64,7 +148,7 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="1">
+   <item row="0" column="2">
     <widget class="QLabel" name="label">
      <property name="minimumSize">
       <size>
@@ -88,39 +172,38 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="4">
-    <spacer name="horizontalSpacer_2">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Fixed</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="0" column="2">
-    <spacer name="horizontalSpacer">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
+   <item row="0" column="0">
+    <widget class="QLabel" name="label_3">
+     <property name="maximumSize">
       <size>
        <width>40</width>
-       <height>20</height>
+       <height>16777215</height>
       </size>
      </property>
-    </spacer>
-   </item>
-   <item row="0" column="0">
-    <widget class="QLabel" name="label_filename">
      <property name="text">
-      <string>TextLabel</string>
+      <string>icon</string>
+     </property>
+     <property name="scaledContents">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="8">
+    <widget class="QPushButton" name="pushButton_2">
+     <property name="minimumSize">
+      <size>
+       <width>60</width>
+       <height>0</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>60</width>
+       <height>16777215</height>
+      </size>
+     </property>
+     <property name="text">
+      <string>取消</string>
      </property>
     </widget>
    </item>

main.cpp

@@ -12,9 +12,9 @@ int main(int argc, char *argv[])
     a.loadTranslator();
     a.setOrganizationName("deepin");
     a.setApplicationVersion(DApplication::buildVersion("1.0"));
-    //a.setApplicationAcknowledgementPage("https://你的网站");
-    //a.setProductIcon(QIcon(":/images/icon.svg"));  //设置Logo
-    //a.setProductName("DtkDemo");
+    a.setApplicationAcknowledgementPage("https://gitee.com/deepin-community-store/deepin-community-store");
+    a.setProductIcon(QIcon::fromTheme("deepin-community-store"));  //设置Logo
+    a.setProductName("深度社区应用商店");
     a.setApplicationName("社区应用商店"); //只有在这儿修改窗口标题才有效
 
     MainWindow w;

mainwindow.cpp

@@ -10,7 +10,7 @@ MainWindow::MainWindow(QWidget *parent)
     w = new Widget;
 
     resize(w->size()); //设置窗口大小
-    setMinimumSize(900,700);
+    setMinimumSize(900,750);
     setCentralWidget(w);
 }
 

server.list

@@ -0,0 +1,5 @@
+http://dcstore.shenmo.tech/
+http://store.shenmo.tech/
+http://store2.shenmo.tech/
+http://store.moshengren.xyz/
+http://127.0.0.1:8000/#/

widget.cpp

@@ -15,6 +15,9 @@
 #include <QPixmap>
 #include <QtConcurrent> //并发
 #include <QSettings>
+#include <QIcon>
+#include <QWebFrame>
+#include <QGraphicsOpacityEffect>
 Widget::Widget(QWidget *parent) :
     QWidget(parent),
     ui(new Ui::Widget)
@@ -24,6 +27,7 @@ Widget::Widget(QWidget *parent) :
 
     ui->setupUi(this);
     ui->webView->page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks);//用来激活接受linkClicked信号
+    ui->webView->page()->settings()->setAttribute(QWebSettings::JavascriptEnabled,true);
     ui->stackedWidget->setCurrentIndex(0);
     ui->listWidget->hide();
     ui->label_setting1->hide();
@@ -55,24 +59,34 @@ Widget::Widget(QWidget *parent) :
     }else {
         serverUrl="http://dcstore.shenmo.tech/";
     }
-    ui->webView->setUrl(serverUrl+"store/");
-
-
     configCanSeve=true;
     qDebug()<<serverUrl;
-    menuUrl[0]=serverUrl + "store/";
-    menuUrl[1]=serverUrl + "store/network/";
-    menuUrl[2]=serverUrl + "store/chat/";
-    menuUrl[3]=serverUrl + "store/music/";
-    menuUrl[4]=serverUrl + "store/video";
-    menuUrl[5]=serverUrl + "store/image_graphics/";
-    menuUrl[6]=serverUrl + "store/games/";
-    menuUrl[7]=serverUrl + "store/";
-    menuUrl[8]=serverUrl + "store/reading/";
-    menuUrl[9]=serverUrl + "store/development/";
-    menuUrl[10]=serverUrl + "store/tools/";
-    menuUrl[11]=serverUrl + "store/others/";
-    menuUrl[12]=serverUrl + "store/themes/";
+    menuUrl[0]=serverUrl + "store/#/";
+    menuUrl[1]=serverUrl + "store/#/network/";
+    menuUrl[2]=serverUrl + "store/#/relations";
+    menuUrl[3]=serverUrl + "store/#/musicandsound";
+    menuUrl[4]=serverUrl + "store/#/videos";
+    menuUrl[5]=serverUrl + "store/#/photos";
+    menuUrl[6]=serverUrl + "store/#/games/";
+    menuUrl[7]=serverUrl + "store/#/office";
+    menuUrl[8]=serverUrl + "store/#/reading/";
+    menuUrl[9]=serverUrl + "store/#/programming";
+    menuUrl[10]=serverUrl + "store/#/tools/";
+    menuUrl[11]=serverUrl + "store/#/others/";
+    menuUrl[12]=serverUrl + "store/#/themes";
+    ui->webView->setUrl(menuUrl[0]);
+    for (int i =0; i<15;i++){
+        download_list[i].num=i;
+    }
+    QGraphicsOpacityEffect *opacityEffect_1=new QGraphicsOpacityEffect;
+    QGraphicsOpacityEffect *opacityEffect_2=new QGraphicsOpacityEffect;
+    ui->line1_widget->setStyleSheet("background-color:#808080");
+    ui->line2_widget->setStyleSheet("background-color:#808080");
+    opacityEffect_1->setOpacity(0.2);
+    opacityEffect_2->setOpacity(0.2);
+    ui->line1_widget->setGraphicsEffect(opacityEffect_1);
+    ui->line2_widget->setGraphicsEffect(opacityEffect_2);
+    connect(ui->webView->page(),SIGNAL(javaScriptWindowObjectCleared()),this,SLOT([=](){qDebug()<<" ";}));
 }
 
 Widget::~Widget()
@@ -82,10 +96,47 @@ Widget::~Widget()
 
 void Widget::on_webView_linkClicked(const QUrl &arg1)
 {
+    //这里通过获取url的方式和现有web不符，
+//    qDebug()<<arg1;
+//    //判断，如果末尾是/就直接访问，如果是app.json就打开详情页
+//    if(arg1.path().right(1)=="/"){
+//        ui->webView->setUrl(arg1);
+//    }else if(arg1.path().right(8)=="app.json"){
+//        load.cancel();//打开并发加载线程前关闭正在执行的线程
+////        load.waitForFinished();
+//        QPixmap pixmap_null;//一个空的图片指针，用来清空先有内容
+//        ui->label_appicon->setPixmap(pixmap_null);
+//        ui->screen_1->setPixmap(pixmap_null);
+//        ui->screen_2->setPixmap(pixmap_null);
+//        ui->screen_3->setPixmap(pixmap_null);
+//        ui->screen_4->setPixmap(pixmap_null);
+//        ui->screen_5->setPixmap(pixmap_null);
+//        //先隐藏详情页负责显示截图的label
+//        ui->screen_1->hide();
+//        ui->screen_2->hide();
+//        ui->screen_3->hide();
+//        ui->screen_4->hide();
+//        ui->screen_5->hide();
+//        ui->label_more->setText("");//清空详情介绍
+//        ui->label_info->setText("");
+//        ui->label_appname->setText("");
+//        ui->pushButton->setEnabled(false);
+//        ui->stackedWidget->setCurrentIndex(2);
+//        load.cancel();//打开并发加载线程前关闭正在执行的线程
+//        load = QtConcurrent::run([=](){
+//            loadappinfo(arg1);
+//        });
+//    }
+}
+void Widget::on_webView_loadStarted()
+{
+
+    ui->label_show->setText("正在加载，请稍候");
+    ui->label_show->show();
+    QUrl arg1=ui->webView->page()->mainFrame()->requestedUrl().toString();
+    qDebug()<<arg1;
     //判断，如果末尾是/就直接访问，如果是app.json就打开详情页
-    if(arg1.path().right(1)=="/"){
-        ui->webView->setUrl(arg1);
-    }else if(arg1.path().right(8)=="app.json"){
+    if(arg1.path().right(8)=="app.json"){
         load.cancel();//打开并发加载线程前关闭正在执行的线程
         load.waitForFinished();
         QPixmap pixmap_null;//一个空的图片指针，用来清空先有内容
@@ -104,7 +155,9 @@ void Widget::on_webView_linkClicked(const QUrl &arg1)
         ui->label_more->setText("");//清空详情介绍
         ui->label_info->setText("");
         ui->label_appname->setText("");
+        ui->pushButton->setEnabled(false);
         ui->stackedWidget->setCurrentIndex(2);
+        load.cancel();//打开并发加载线程前关闭正在执行的线程
         load = QtConcurrent::run([=](){
             loadappinfo(arg1);
         });
@@ -136,9 +189,15 @@ void Widget::loadappinfo(QUrl arg1)
         ui->label_show->show();
         //软件信息加载
         QString info;
-        info="版本号："+json["Version"].toString()+"\n";
-        info+="作者："+json["Author"].toString()+"\n";
-        info+="官网："+json["Website"].toString()+"\n";
+        info="包名："+json["Pkgname"].toString()+"\n";
+        info+="版本号："+json["Version"].toString()+"\n";
+        if(json["Author"].toString()!="" && json["Author"].toString()!=" "){
+            info+="作者："+json["Author"].toString()+"\n";
+        }
+
+        if(json["Website"].toString()!="" && json["Website"].toString()!=" "){
+            info+="官网："+json["Website"].toString()+"\n";
+        }
         info+="投稿者："+json["Contributor"].toString()+"\n";
         info+="更新时间："+json["Update"].toString()+"\n";
         info+="大小："+json["Size"].toString()+"\n";
@@ -159,6 +218,7 @@ void Widget::loadappinfo(QUrl arg1)
         QPixmap appicon;
         qDebug()<<appicon.load("icon.png");
         ui->label_appicon->setPixmap(appicon);
+        ui->pushButton->setEnabled(true);
         //截图展示加载
         get_json.start("wget "+urladdress+"screen_1.png");
         get_json.waitForFinished();
@@ -204,7 +264,9 @@ void Widget::loadappinfo(QUrl arg1)
 
 void Widget::chooseLeftMenu(int index)
 {
+    nowMenu=index;
     for (int i=0;i<15;i++) {
+        load.cancel();//打开并发加载线程前关闭正在执行的线程
         left_list[i]->setStyleSheet("");
         left_menu_bg[i]->setStyleSheet("");
     }
@@ -239,11 +301,15 @@ void Widget::on_pushButton_clicked()
     urList.append(url);
     download_list[allDownload-1].setName(appName);
     download_list[allDownload-1].setFileName(fileName);
+    QPixmap icon;
+    icon.load("icon.png");
+    system("cp icon.png icon_"+QString::number(allDownload-1).toUtf8()+".png");
+    download_list[allDownload-1].seticon(icon);
     if(!isBusy){
         file = new QFile(fileName);
         if(!file->open(QIODevice::WriteOnly)){
             delete file;
-            file = 0;
+            file = nullptr;
             return ;
         }
         nowDownload+=1;
@@ -257,6 +323,7 @@ void Widget::startRequest(QUrl url)
     ui->label->hide();
     isBusy=true;
     isdownload=true;
+    download_list[allDownload-1].free=false;
     reply = manager->get(QNetworkRequest(url));
     connect(reply,SIGNAL(finished()),this,SLOT(httpFinished()));
     connect(reply,SIGNAL(readyRead()),this,SLOT(httpReadyRead()));
@@ -264,11 +331,6 @@ void Widget::startRequest(QUrl url)
 
 }
 
-void Widget::closeList(int)
-{
-
-}
-
 
 void Widget::httpReadyRead()
 {
@@ -279,10 +341,15 @@ void Widget::httpReadyRead()
 }
 void Widget::updateDataReadProgress(qint64 bytesRead, qint64 totalBytes)
 {
-//    download_list[nowDownload-1].setMax(1000); //最大值
-//    download_list[nowDownload-1].setValue((bytesRead*1000)/totalBytes); //当前值
-    download_list[nowDownload-1].setMax(bytesRead/10);
-    download_list[nowDownload-1].setValue(totalBytes/10);
+    download_list[nowDownload-1].setMax(10000); //最大值
+    download_list[nowDownload-1].setValue((bytesRead*10000)/totalBytes); //当前值
+    if(download_list[nowDownload-1].close){
+        download_list[nowDownload-1].closeDownload();
+        httpFinished();
+
+    }
+//    download_list[nowDownload-1].setMax(bytesRead/10);
+//    download_list[nowDownload-1].setValue(totalBytes/10);
 }
 
 void Widget::httpFinished() //完成下载
@@ -291,23 +358,27 @@ void Widget::httpFinished() //完成下载
 file->flush();
 file->close();
 reply->deleteLater();
-reply = 0;
+reply = nullptr;
 delete file;
-file = 0;
+file = nullptr;
 isdownload=false;
 isBusy=false;
 download_list[nowDownload-1].readyInstall();
+download_list[nowDownload-1].free=true;
 if(nowDownload<allDownload){
-    QString fileName=download_list[nowDownload].getName();
+    nowDownload+=1;
+    while (download_list[nowDownload-1].close) {
+        nowDownload+=1;
+    }
+    QString fileName=download_list[nowDownload-1].getName();
     file = new QFile(fileName);
     if(!file->open(QIODevice::WriteOnly))
     {
         qDebug()<<"file open error";
         delete file;
-        file = 0;
+        file = nullptr;
         return ;
     }
-    nowDownload+=1;
     startRequest(urList.at(nowDownload-1));
 }
 }
@@ -382,19 +453,18 @@ void Widget::on_menu_btn_settings_clicked()
 }
 void Widget::on_pushButton_2_clicked()
 {
+    ui->webView->setUrl(menuUrl[nowMenu]);
     ui->stackedWidget->setCurrentIndex(0);
 }
 
-void Widget::on_webView_loadStarted()
-{
-    ui->label_show->setText("正在加载，请稍候");
-    ui->label_show->show();
-}
 
-void Widget::on_webView_loadFinished(bool arg1)
+
+void Widget::on_webView_loadFinished()
 {
-    ui->label_show->setText("");
-    ui->label_show->hide();
+    if(ui->webView->page()->mainFrame()->requestedUrl().toString().right(5)!=".json"){
+        ui->label_show->setText("");
+        ui->label_show->hide();
+    }
 }
 
 

widget.h

@@ -27,7 +27,6 @@ public:
     int nowDownload=0;
     int allDownload=0;
     int isdownload=false;
-    void closeList(int);
     void loadappinfo(QUrl);
     void chooseLeftMenu(int index);
     QPixmap screen[5];
@@ -74,7 +73,7 @@ private slots:
 
     void on_webView_loadStarted();
 
-    void on_webView_loadFinished(bool arg1);
+    void on_webView_loadFinished();
 
     void on_menu_btn_theme_clicked();
 
@@ -97,6 +96,7 @@ private:
     QWidget * left_menu_bg[15];
     QUrl menuUrl[13];
     bool configCanSeve=false;
+    int nowMenu=0;
 
 };
 

widget.ui

@@ -87,7 +87,7 @@
           </font>
          </property>
          <property name="styleSheet">
-          <string notr="true">background-color:#FFFFFF</string>
+          <string notr="true"/>
          </property>
          <property name="text">
           <string>当前下载列表为空</string>
@@ -137,7 +137,7 @@
             <x>0</x>
             <y>0</y>
             <width>781</width>
-            <height>770</height>
+            <height>815</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_17">
@@ -474,6 +474,19 @@
              </layout>
             </widget>
            </item>
+           <item>
+            <spacer name="verticalSpacer_5">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>20</width>
+               <height>40</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
           </layout>
          </widget>
         </widget>
@@ -495,8 +508,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>547</width>
-            <height>130</height>
+            <width>765</width>
+            <height>595</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_23">
@@ -1147,7 +1160,7 @@
             </sizepolicy>
            </property>
            <property name="text">
-            <string>系统管理</string>
+            <string>系统工具</string>
            </property>
           </widget>
          </item>
@@ -1247,7 +1260,7 @@
        </widget>
       </item>
       <item>
-       <widget class="QWidget" name="widget_2" native="true">
+       <widget class="QWidget" name="line1_widget" native="true">
         <property name="minimumSize">
          <size>
           <width>0</width>
@@ -1257,11 +1270,11 @@
         <property name="maximumSize">
          <size>
           <width>16777215</width>
-          <height>1</height>
+          <height>4</height>
          </size>
         </property>
         <property name="styleSheet">
-         <string notr="true">background-color:#E0E0E1</string>
+         <string notr="true">background-color:#808080</string>
         </property>
        </widget>
       </item>
@@ -1374,7 +1387,7 @@
     </widget>
    </item>
    <item row="0" column="1" rowspan="2">
-    <widget class="QWidget" name="widget_8" native="true">
+    <widget class="QWidget" name="line2_widget" native="true">
      <property name="minimumSize">
       <size>
        <width>1</width>
@@ -1388,7 +1401,7 @@
       </size>
      </property>
      <property name="styleSheet">
-      <string notr="true">background-color:#cccccc</string>
+      <string notr="true">background-color:#808080</string>
      </property>
     </widget>
    </item>