2 Комити ddc6f54a81 ... 4f91a6d251

Аутор SHA1 Порука Датум
  xuqiang 4f91a6d251 fix ota service permission issue пре 3 месеци
  xuqiang 01145a8361 change data interrupt prompt size пре 3 месеци
3 измењених фајлова са 9 додато и 7 уклоњено
  1. 4 2
      services/otaserver/Makefile
  2. 2 2
      services/otaserver/scripts/run.sh
  3. 3 3
      src/mainwindow.cpp

+ 4 - 2
services/otaserver/Makefile

@@ -1,7 +1,9 @@
+all: build release
+
 build:
 	pyinstaller otaserver.spec
 
-release:
+release: build
 	mkdir -p ./release/otaserver
 	rm -rf ./release/otaserver/*
 	pyinstaller otaserver.spec
@@ -11,7 +13,7 @@ release:
 	cp -r ./dist ./release/otaserver/bin
 	cp -f ./otaserver.service ./release/otaserver
 
-install:
+install: build
 	mkdir -p /usr/local/otaserver
 	cp -r ./dist /usr/local/otaserver/bin
 	cp -f ./run.sh /usr/local/otaserver

+ 2 - 2
services/otaserver/scripts/run.sh

@@ -59,8 +59,8 @@ esac
 
 echo "create a symbolic link..."
 rm -rf $dst_workspace
-ln -sf /userdata/workspace $dst_workspace
-chown -h forlinx:forlinx $dst_workspace
+ln -sf $src_workspace $dst_workspace
+chown -R forlinx:forlinx $src_workspace
 
 echo "restarting app..."
 systemctl enable --now monitor

+ 3 - 3
src/mainwindow.cpp

@@ -47,14 +47,14 @@ MainWindow::MainWindow(QWidget *parent)
             LOG_WARN("data transfer interrupted");
             if(!m_pErrStrLabel) {
                 QFont font;
-                font.setPixelSize(40);
+                font.setPixelSize(16);
                 font.setBold(true);
                 m_pErrStrLabel = new QLabel("数据传输中断!", this);
-                m_pErrStrLabel->resize(this->size());
+                m_pErrStrLabel->resize(150, 38);
                 m_pErrStrLabel->setFont(font);
                 m_pErrStrLabel->setAlignment(Qt::AlignCenter);
                 m_pErrStrLabel->setStyleSheet("QLabel { background-color: #FFD6D6; color: #D8000C; padding: 4px; border-radius: 4px; }");
-                m_pErrStrLabel->move((this->width() - m_pErrStrLabel->width()) / 2, (this->height() - m_pErrStrLabel->height()) / 2);
+                m_pErrStrLabel->move((this->width() - m_pErrStrLabel->width()) / 2, 0);
                 m_pErrStrLabel->show();
             }
         } else {