Browse Source

change tool_fwupdate.

yuchuli 1 year ago
parent
commit
5425b86f78
1 changed files with 16 additions and 6 deletions
  1. 16 6
      src/tool/tool_fwupdate/mainwindow.cpp

+ 16 - 6
src/tool/tool_fwupdate/mainwindow.cpp

@@ -34,7 +34,7 @@ void MainWindow::on_pushButton_Update_clicked()
     ui->pushButton_Update->setEnabled(false);
     ui->plainTextEdit->setPlainText("Connecting server...");
 
-    socket_->connectToHost("127.0.0.1",19100);
+    socket_->connectToHost("116.63.46.168",19100);
 
 }
 
@@ -127,26 +127,29 @@ void MainWindow::threadunzip()
 {
     char * strhome = getenv("HOME");
     char strshell[1000];
-    snprintf(strshell,1000,"unzip -o %s -d %s; rm %s;rm %s,cd %s; unzip -o app.zip -d .;rm app.zip; rm frp.zip; ",
+    snprintf(strshell,1000,"unzip -o %s -d %s; rm %s;rm %s;cd %s; unzip -o app.zip -d .;rm app.zip; rm frp.zip; ",
              mstrfilename,strhome,mstrfilename,mstrlogname,strhome);
     system(strshell);
-    std::cout<<strshell<<std::endl;
+//    std::cout<<strshell<<std::endl;
     mbunzipcomplete = true;
 }
 
 void MainWindow::onTimer()
 {
+    static int mnLastProc = 0;
     if(mnState == 1)
     {
 
         char strshell[1000];
         snprintf(strshell,256,"wget -b -O %s http://116.63.46.168:19000/%s -o %s",mstrfilename,mstrdownname,mstrlogname);
-        std::cout<<strshell<<std::endl;
+//        std::cout<<strshell<<std::endl;
+
 
         system(strshell);
 
         mnState = 2;
         ui->progressBar->setValue(0);
+        mnLastProc = 0;
 
     }
 
@@ -163,6 +166,7 @@ void MainWindow::onTimer()
         if(mbunzipcomplete)
         {
             QMessageBox::information(this,"Update","Update Complete",QMessageBox::YesAll);
+            ui->plainTextEdit->setPlainText("Update Complete.");
             mnState = 0;
 //            ui->pushButton_Update->setEnabled(true);
         }
@@ -190,17 +194,23 @@ void MainWindow::onTimer()
                     QString strproc =strline.mid(index + 54,3);
                     nProc = strproc.toInt();
                     bProcOK = true;
+
                 }
                 ba = xFile.readLine(3000);
             }
             if(bProcOK)
             {
-                ui->progressBar->setValue(nProc);
+                if(mnLastProc <= nProc)
+                {
+                    ui->progressBar->setValue(nProc);
+                    mnLastProc = nProc;
+                }
+
 
                 if(nProc == 100)
                 {
                     mnState = 3;
-                    ui->plainTextEdit->setPlainText("Unzip File.");
+                    ui->plainTextEdit->setPlainText("Unzip File.....   Please Wait 10 senconds.");
                 }