v0.3 支持应用图标批量下载优化程序图标

v0.3 支持应用图标批量下载 1.选择批量下载模式 2.选择下载位置增加应用标题栏图标【关于】界面使用坚果R2背面新LOGO 程序右侧SmartisanOS背景扣除白色背景支持批量下载已下载数量显示
houyawei-NO1 · Mar 7, 2021 · dc189ca · dc189ca
1 parent dd0fb6f
commit dc189ca
Show file tree

Hide file tree

Showing 15 changed files with 107 additions and 30 deletions.
diff --git a/DtkSmartisanosLogo.pro b/DtkSmartisanosLogo.pro
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ DtkSmartisanosLogo
 
 ![新建文件夹](https://github.com/houyawei-NO1/DtkSmartisanosLogo/blob/main/%E8%AE%BE%E8%AE%A1%E5%9B%BE.jpg)
 
-v0.1(应该是0.01)
+v0.1
 
 单应用图标下载
 
@@ -22,10 +22,30 @@ v0.1(应该是0.01)
 
 ![v0.1下载图片](https://github.com/houyawei-NO1/DtkSmartisanosLogo/blob/main/v0.1(2).jpg)
 
-v0.02
+v0.2
 
 多应用图标批量下载
 
 ![v0.2预览图](https://github.com/houyawei-NO1/DtkSmartisanosLogo/blob/main/v0.2.gif)
 
 ![v0.2预览图](https://s3.ax1x.com/2021/03/05/6e7LCQ.gif)
+
+
+v0.3
+支持应用图标批量下载
+1.选择批量下载模式
+2.选择下载位置
+
+增加应用标题栏图标
+
+【关于】界面使用坚果R2背面新LOGO
+
+程序右侧SmartisanOS背景扣除白色背景
+
+支持批量下载已下载数量显示
+
+![v0.3_1预览图](https://github.com/houyawei-NO1/DtkSmartisanosLogo/blob/main/v0.3_1.jpg)
+
+![v0.3_2预览图](https://github.com/houyawei-NO1/DtkSmartisanosLogo/blob/main/v0.3_2.jpg)
+
+![v0.3_3预览图](https://github.com/houyawei-NO1/DtkSmartisanosLogo/blob/main/v0.3_3.jpg)
diff --git a/SmartisanOS_png_21.03.07.zip b/SmartisanOS_png_21.03.07.zip
diff --git a/images/iconfinder-icon.svg b/images/iconfinder-icon.svg
diff --git a/images/smartisan.ico b/images/smartisan.ico
diff --git a/images/smartisan.png b/images/smartisan.png
diff --git a/images/smartisanos.png b/images/smartisanos.png
diff --git a/images/smartisanos_small.png b/images/smartisanos_small.png
diff --git a/main.cpp b/main.cpp
@@ -12,8 +12,8 @@ int main(int argc, char *argv[])
     DApplication a(argc, argv);
     a.setOrganizationName("deepin");
     a.setApplicationName("dtk_Smartisanos图标下载助手");
-    a.setApplicationVersion("0.02");
-    a.setProductIcon(QIcon(":/images/hyw.ico"));
+    a.setApplicationVersion("0.3");
+    a.setProductIcon(QIcon(":/images/smartisan.ico"));
     a.setProductName("DTK_Smartisanos图标下载助手");
     a.setApplicationDescription("这是一个DTK_Smartisanos图标下载助手应用");
 

diff --git a/resources.qrc b/resources.qrc
@@ -3,5 +3,8 @@
         <file>images/logo.svg</file>
         <file>images/hyw.ico</file>
         <file>images/smartisanos.png</file>
+        <file>images/smartisan.ico</file>
+        <file>images/smartisan.png</file>
+        <file>images/iconfinder-icon.svg</file>
     </qresource>
 </RCC>
diff --git a/smartisanoslogo.cpp b/smartisanoslogo.cpp
@@ -3,6 +3,7 @@
 #include <DSearchEdit>
 #include <DTitlebar>
 #include <QNetworkAccessManager>
+static int num=0;
 SmartisanOsLogo::SmartisanOsLogo(DMainWindow *parent)
     : DMainWindow(parent)
 {
@@ -11,6 +12,14 @@ SmartisanOsLogo::SmartisanOsLogo(DMainWindow *parent)
     moveToCenter(this);
     SmartisanOsLogo::resize(900,700);
     SmartisanOsLogo::setMinimumSize(900,700);
+
+    QDir currDir = QCoreApplication::applicationDirPath();
+    //currDir.cdUp();
+    QString m_savePath = currDir.path();
+    QString filenameText = m_savePath;
+    filenameText.append("/allapp.json");
+
+
     QHBoxLayout *hlayout =new QHBoxLayout(w);
     QVBoxLayout *v1layout = new QVBoxLayout(w);
     QHBoxLayout *modelayout = new QHBoxLayout(w);
@@ -36,6 +45,8 @@ SmartisanOsLogo::SmartisanOsLogo(DMainWindow *parent)
     DLabel *logo = new DLabel;
     logo->setText("图标预览：");
     logo->setAlignment(Qt::AlignCenter);
+    titlebar()->setIcon(QIcon(":/images/iconfinder-icon.svg"));
+
 
 
 
@@ -92,6 +103,35 @@ SmartisanOsLogo::SmartisanOsLogo(DMainWindow *parent)
 
 
 
+     connect(modecombobox, &DComboBox::currentTextChanged, this, [ = ] {
+         switch (modecombobox->currentIndex()) {
+
+             case 0:
+             {
+               mode->setText("①下载模式:");
+               nameLineEdit->show();
+               name->setText("②应用名称：");
+               location->setText("③下载位置：");
+
+             }
+             break;
+
+             case 1:
+            {
+             name->setText(" ");
+             nameLineEdit->hide();
+             location->setText("②下载位置：");
+
+            }
+             break;
+
+             case 2:
+            {
+            }
+              break;
+
+         }
+     });
 
         //download button
         connect(Download, &DPushButton::clicked, this, [ = ] {
@@ -115,7 +155,7 @@ SmartisanOsLogo::SmartisanOsLogo(DMainWindow *parent)
                 case 1:
                {
 
-                QFile file("allapp.json");
+                QFile file(filenameText);
                 if(file.open(QIODevice::ReadOnly | QIODevice::Text))
                     {
                     QString value = file.readAll();
@@ -124,15 +164,20 @@ SmartisanOsLogo::SmartisanOsLogo(DMainWindow *parent)
                     QJsonDocument document = QJsonDocument::fromJson(value.toUtf8(), &parseJsonErr);
 
                     if (! (parseJsonErr.error == QJsonParseError::NoError)) {
-                        QMessageBox::about(NULL, "提示", "配置文件错误！");
+                        //QMessageBox::about(NULL, "提示", "配置文件错误！");
+                        DDialog dlg("提示", "配置文件错误！");
+                        dlg.addButton("好的", true, DDialog::ButtonWarning);
+                        dlg.setIcon(QIcon(":/images/hyw.ico"));
+                        dlg.exec();
                         return;
                     }
 
-                    QJsonObject jsonObject = document.object();
 
+                    QJsonObject jsonObject = document.object();
                     QJsonObject::Iterator it;
                     QString keyString="";
                     QString valueString="";
+
                     for(it=jsonObject.begin();it!=jsonObject.end();it++)
                        {
 //                           QString value=it.value().toString();
@@ -145,14 +190,27 @@ SmartisanOsLogo::SmartisanOsLogo(DMainWindow *parent)
                              obj.insert("package",packagename);
                              QJsonDocument jsonDoc(obj);
                              QNetworkReply* reply = accessManager->post(request, '[' + jsonDoc.toJson(QJsonDocument::Compact) + ']');
+                             name->setText("已下载图片"+QString::number(num)+"张");
                              if (reply->isFinished())
                                  reply->deleteLater();
+                             QEventLoop loop;
+                             QTimer::singleShot(20,&loop,SLOT(quit()));
+                             loop.exec();
 
                        }
+                    num=0;
 //                       keyString=keyString.left(keyString.length()-1);
 //                       valueString=valueString.left(valueString.length()-1);
 
                 }
+                else {
+                    //QMessageBox::about(NULL, "提示", "未找到文件allapp.json");
+                    DDialog dlg("提示", "未找到文件allapp.json");
+                    dlg.addButton("好的", true, DDialog::ButtonWarning);
+                    dlg.setIcon(QIcon(":/images/hyw.ico"));
+                    dlg.exec();
+                    return;
+                }
 
 
 
@@ -183,6 +241,8 @@ SmartisanOsLogo::SmartisanOsLogo(DMainWindow *parent)
                locationLineEdit->setText(PathName);
         });
 
+
+
 }
 SmartisanOsLogo::~SmartisanOsLogo()
 {
@@ -197,7 +257,7 @@ void SmartisanOsLogo::finishedSlot(QNetworkReply *reply)
              QStringList urlpngList=urlpng.split(QRegExp("[\"]"));
              qDebug()<<"urlpngList"<<urlpngList[9];
              logoPng->setPixmap(setpnglabel(urlpngList[9]));
-
+             if(urlpngList[9].size()>20 ) num++;
              QString fileName = /*"/home/houyawei/Pictures/"*/PathName + '/' + urlpngList[5] + ".png";
              QString url_name= urlpngList[9];	//ui->url_text为Qline edit控件
              downIURL_to_picture(url_name,fileName);//将URL地址和要保存的文件名字传给函数调用

diff --git a/smartisanoslogo.h b/smartisanoslogo.h
@@ -21,6 +21,7 @@
 #include <QFileDialog>
 #include <QDateTime>
 #include <QJsonArray>
+#include <QTimer>
 DWIDGET_USE_NAMESPACE
 #ifndef DTKSERIALPORT_H
 #define DTKSERIALPORT_H
@@ -40,9 +41,11 @@ class SmartisanOsLogo : public DMainWindow
      DPushButton *filelocation = new DPushButton();
      QString PathName,current_File;
      QDateTime current_File_time;
+
 private:
     QWidget *w=new QWidget;
     void setTheme(DGuiApplicationHelper::ColorType);
+
 private slots:
     void finishedSlot(QNetworkReply* reply);
 };

diff --git a/v0.3_1.jpg b/v0.3_1.jpg
diff --git a/v0.3_2.jpg b/v0.3_2.jpg
diff --git a/v0.3_3.jpg b/v0.3_3.jpg