git-svn-id: file:///srv/xfl/svn/SVN/wzx/SpeedNumCube@17347 2e29f1fe-100b-dc43-ad61-23effca57775

publish/product/app.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SpeedNumCube>
-<versioninfo minver="7.5.5" maxver="7.5.5">极速号码魔方</versioninfo>
+<versioninfo minver="7.5.5" maxver="7.6.1">极速号码魔方</versioninfo>
 <download_server>
 <url>http://app.iyoogo.com:86/product/</url>
 </download_server>
@@ -26,7 +26,7 @@
 <zipfile createtime="2018-12-13 18:38:58" lastupdatetime="2018-12-13 18:38:58">SetupSegment.zip</zipfile>
 <zipfile createtime="2019-03-18 16:53:23" lastupdatetime="2019-03-18 16:53:23">SNCCore.zip</zipfile>
 <zipfile createtime="2018-12-18 14:31:44" lastupdatetime="2018-12-18 14:31:44">SNCCube.zip</zipfile>
-<zipfile createtime="2019-03-29 13:47:35" lastupdatetime="2019-03-29 13:47:35">SNCDataBase.zip</zipfile>
+<zipfile createtime="2019-04-22 13:57:03" lastupdatetime="2019-04-22 13:57:03">SNCDataBase.zip</zipfile>
 <zipfile createtime="2018-12-18 14:31:00" lastupdatetime="2018-12-18 14:31:00">SNCHelpMe.zip</zipfile>
 <zipfile createtime="2018-12-18 14:36:21" lastupdatetime="2018-12-18 14:36:21">SNCMain.zip</zipfile>
 <zipfile createtime="2015-01-25 22:21:41" lastupdatetime="2015-01-25 22:21:41">SNCNum.zip</zipfile>
@@ -38,8 +38,8 @@
 <zipfile createtime="2016-08-04 22:32:39" lastupdatetime="2016-08-04 22:32:39">SNCUpdate.zip</zipfile>
 <zipfile createtime="2019-01-17 17:29:43" lastupdatetime="2019-01-17 17:29:43">SNCUser.zip</zipfile>
 <zipfile createtime="2018-12-18 14:30:22" lastupdatetime="2018-12-18 14:30:22">snczip.zip</zipfile>
-<zipfile createtime="2018-12-18 14:35:58" lastupdatetime="2018-12-18 14:35:58">snczxsh.zip</zipfile>
-<zipfile createtime="2018-12-18 14:36:23" lastupdatetime="2018-12-18 14:36:23">SpeedNumCube.zip</zipfile>
+<zipfile createtime="2019-04-22 16:47:13" lastupdatetime="2019-04-22 16:47:13">snczxsh.zip</zipfile>
+<zipfile createtime="2019-04-22 12:45:31" lastupdatetime="2019-04-22 12:45:31">SpeedNumCube.zip</zipfile>
 <zipfile createtime="2012-05-08 15:03:50" lastupdatetime="2012-05-08 15:03:50">sqlite3.zip</zipfile>
 <zipfile createtime="2016-08-18 22:58:46" lastupdatetime="2016-08-18 22:58:46" updatemode="always">sys.zip</zipfile>
 <zipfile createtime="2013-05-09 22:44:12" lastupdatetime="2013-05-09 22:44:12" updatemode="never">user.zip</zipfile>

publish/speednumcube.iss

@@ -7,7 +7,7 @@ Name: "cn"; MessagesFile: "compiler:Languages\ChineseSimplified.isl"
 
 [Setup]
 AppName=极速号码魔方
-AppVersion=7.5.5
+AppVersion=7.6.1
 AppPublisher=佰意兴网络科技有限公司
 AppPublisherURL=http://www.iyoogo.com:86/
 DisableDirPage = yes

publish/test/app.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SpeedNumCube>
-<versioninfo minver="7.5.5" maxver="7.5.5">极速号码魔方</versioninfo>
+<versioninfo minver="7.5.5" maxver="7.6.1">极速号码魔方</versioninfo>
 <download_server>
 <url>http://app.iyoogo.com:86/test/</url>
 </download_server>
@@ -26,7 +26,7 @@
 <zipfile createtime="2018-12-13 18:38:58" lastupdatetime="2018-12-13 18:38:58">SetupSegment.zip</zipfile>
 <zipfile createtime="2019-03-18 16:53:23" lastupdatetime="2019-03-18 16:53:23">SNCCore.zip</zipfile>
 <zipfile createtime="2018-12-18 14:31:44" lastupdatetime="2018-12-18 14:31:44">SNCCube.zip</zipfile>
-<zipfile createtime="2019-03-29 13:47:35" lastupdatetime="2019-03-29 13:47:35">SNCDataBase.zip</zipfile>
+<zipfile createtime="2019-04-22 13:57:03" lastupdatetime="2019-04-22 13:57:03">SNCDataBase.zip</zipfile>
 <zipfile createtime="2018-12-18 14:31:00" lastupdatetime="2018-12-18 14:31:00">SNCHelpMe.zip</zipfile>
 <zipfile createtime="2018-12-18 14:36:21" lastupdatetime="2018-12-18 14:36:21">SNCMain.zip</zipfile>
 <zipfile createtime="2015-01-25 22:21:41" lastupdatetime="2015-01-25 22:21:41">SNCNum.zip</zipfile>
@@ -38,8 +38,8 @@
 <zipfile createtime="2016-08-04 22:32:39" lastupdatetime="2016-08-04 22:32:39">SNCUpdate.zip</zipfile>
 <zipfile createtime="2019-01-17 17:29:43" lastupdatetime="2019-01-17 17:29:43">SNCUser.zip</zipfile>
 <zipfile createtime="2018-12-18 14:30:22" lastupdatetime="2018-12-18 14:30:22">snczip.zip</zipfile>
-<zipfile createtime="2018-12-18 14:35:58" lastupdatetime="2018-12-18 14:35:58">snczxsh.zip</zipfile>
-<zipfile createtime="2018-12-18 14:36:23" lastupdatetime="2018-12-18 14:36:23">SpeedNumCube.zip</zipfile>
+<zipfile createtime="2019-04-22 16:47:13" lastupdatetime="2019-04-22 16:47:13">snczxsh.zip</zipfile>
+<zipfile createtime="2019-04-22 12:45:31" lastupdatetime="2019-04-22 12:45:31">SpeedNumCube.zip</zipfile>
 <zipfile createtime="2012-05-08 15:03:50" lastupdatetime="2012-05-08 15:03:50">sqlite3.zip</zipfile>
 <zipfile createtime="2016-08-18 22:58:46" lastupdatetime="2016-08-18 22:58:46" updatemode="always">sys.zip</zipfile>
 <zipfile createtime="2013-05-09 22:44:12" lastupdatetime="2013-05-09 22:44:12" updatemode="never">user.zip</zipfile>

sncprojects/lib/SNCDataBase/sncdatabase.cpp

@@ -632,12 +632,12 @@ QMap<QString,QStringList> SNCDataBase::getLocalClientConfigs()
 }
 QString SNCDataBase::getAppVersion()
 {
-    return "7.5.5";//±ØÐëÊÇ7.1.0Èý¶Î
+    return "7.6.1";//±ØÐëÊÇ7.1.0Èý¶Î
 }
 
 QString SNCDataBase::getAppVersion2()
 {
-    return "7.5.5";
+    return "7.6.1";
 }
 QString SNCDataBase::getSegVersion()
 {

sncprojects/lib/snczxsh/formshkjfree.cpp

@@ -924,6 +924,8 @@ void FormShkjFree::on_pushButtonBatchDown_clicked()
     QString errText;
     errText = "";
     defaultZipName = "batch";
+
+    int num = 0;
     for(int i=0;i<ui->tableWidget->rowCount();i++)
     {
         QTableWidgetItem *item = ui->tableWidget->item(i,0);
@@ -940,6 +942,9 @@ void FormShkjFree::on_pushButtonBatchDown_clicked()
             QString rpnum;
             if(item->checkState()==Qt::Checked)
             {
+                num++;
+                //ui->batchDlHint->setText(QString("正在分析第 %1 个文件，请稍候").arg(num));
+
                 ssid = item->data(Qt::UserRole).toString();
                 optdate = ui->tableWidget->item(i,1)->data(Qt::UserRole).toString();
                 province = ui->tableWidget->item(i,2)->data(Qt::UserRole).toString();
@@ -952,7 +957,8 @@ void FormShkjFree::on_pushButtonBatchDown_clicked()
                 selected++;
                 if(dealstatus=="2" || dealstatus=="3")
                 {
-                    defaultZipName += "_"+ssid;
+                    if (num <= 10)
+                        defaultZipName += "_"+ssid;
                     QDateTime now = QDateTime::currentDateTime();
                     QDateTime then = QDateTime::fromString(optdate,"yyyy-MM-dd hh:mm:ss");
                     qDebug()<<then.daysTo(now)<<then<<now<<optdate;
@@ -969,6 +975,11 @@ void FormShkjFree::on_pushButtonBatchDown_clicked()
             }
         }
     }
+    //ui->batchDlHint->setText("");
+
+    if (num > 10)
+        defaultZipName += "_more";
+
     if(selected==0)
     {
         QMessageBox::critical(this,"提示","请选择要下载的数据！",QMessageBox::Ok);
@@ -1010,7 +1021,8 @@ void FormShkjFree::on_pushButtonBatchDown_clicked()
     QStringList files;
     ui->pushButtonBatchDown->setEnabled(false);
     this->setCursor(Qt::WaitCursor);
-    int num = 0;
+
+    num = 0;
     for(int i=0;i<ui->tableWidget->rowCount();i++)
     {
         QTableWidgetItem *item = ui->tableWidget->item(i,0);

sncprojects/sncprojects.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by Qt Creator 2.6.1, 2019-04-22T12:42:07. -->
+<!-- Written by Qt Creator 2.6.1, 2019-04-22T16:47:07. -->
 <qtcreator>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>