Merge branch 'dev'

Author: wh201906

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 [中文](doc/CHANGELOG/CHANGELOG_zh_CN.md)  
 
+## V0.2.1
++ Add command line option to set config file path  
++ Fix some bugs in file transceiver  
++ Add touch screen gesture support for some scrollable widgets  
+
 ## V0.2
 + Supports TCP client/server, UDP, Bluetooth SPP client/server and Bluetooth BLE
 + All servers support 1:N connections. Sent to/Receive from/Disconnect any client as you want

doc/CHANGELOG/CHANGELOG_zh_CN.md

@@ -2,6 +2,11 @@
 
 [English](../../CHANGELOG.md)  
 
+## V0.2.1
++ 支持通过命令行参数指定配置文件路径  
++ 修复文件收发功能的一些小BUG  
++ 对一些可以滚动的组件添加触摸屏手势支持  
+
 ## V0.2
 + 支持TCP客户端/服务器，UDP，蓝牙SPP客户端/服务器和蓝牙BLE
 + TCP服务器和蓝牙SPP服务器支持一对多连接，可以任意指定收发对象，断开指定连接

src/SerialTest.pro

@@ -81,7 +81,7 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin
 !isEmpty(target.path): INSTALLS += target
 
 # Remember to change version in AndroidManifest.xml
-VERSION = 0.2.0
+VERSION = 0.2.1
 QMAKE_TARGET_PRODUCT = "SerialTest"
 QMAKE_TARGET_DESCRIPTION = "SerialTest"
 QMAKE_TARGET_COMPANY = "wh201906"

src/android/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<manifest package="priv.wh201906.serialtest" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="V0.2" android:versionCode="20" android:installLocation="auto">
+<manifest package="priv.wh201906.serialtest" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="V0.2.1" android:versionCode="21" android:installLocation="auto">
     <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
          Remove the comment if you do not require these default permissions. -->
     <!-- %%INSERT_PERMISSIONS -->

src/ctrltab.cpp

@@ -13,6 +13,7 @@
 #include <QMessageBox>
 #include <QJsonDocument>
 #include <QJsonArray>
+#include <QScroller>
 
 CtrlTab::CtrlTab(QWidget *parent) :
     QWidget(parent),
@@ -29,6 +30,7 @@ CtrlTab::CtrlTab(QWidget *parent) :
     commentRegExp->optimize();
 
     ui->ctrl_dataEdit->hide();
+    QScroller::grabGesture(ui->ctrl_itemArea);
 }
 
 CtrlTab::~CtrlTab()

src/devicetab.cpp

@@ -8,6 +8,7 @@
 #include <QBluetoothLocalDevice>
 #include <QNetworkInterface>
 #include <QTreeWidgetItem>
+#include <QScroller>
 #ifdef Q_OS_ANDROID
 #include <QtAndroid>
 #include <QAndroidJniEnvironment>
@@ -276,6 +277,14 @@ void DeviceTab::initUI()
     ui->Net_localPortEdit->setValidator(m_netPortValidator);
     ui->Net_remotePortEdit->setValidator(m_netPortValidator);
 
+    QScroller::grabGesture(ui->BLEC_argsScrollArea);
+    QScroller::grabGesture(ui->Net_argsScrollArea);
+    QScroller::grabGesture(ui->SP_portList);
+    QScroller::grabGesture(ui->BTServer_deviceList);
+    QScroller::grabGesture(ui->BTClient_deviceList);
+    QScroller::grabGesture(ui->BLEC_deviceList);
+    QScroller::grabGesture(ui->BLEC_UUIDList);
+    QScroller::grabGesture(ui->Net_addrPortList);
 }
 
 void DeviceTab::getAvailableTypes(bool useFirstValid)

src/filetab.cpp

@@ -282,7 +282,13 @@ void FileTab::onDataTransmitted(qsizetype num)
 void FileTab::onDataReceived(qsizetype num)
 {
     m_handledSize += num;
-    ui->sizeLabel->setText(QLocale(QLocale::English).toString(m_handledSize) + " Bytes");
+    if(currentProtocol() == FileXceiver::RawProtocol && ui->RawRx_autostopByteButton->isChecked())
+    {
+        ui->progressBar->setValue((double)m_handledSize / m_fileSize * 100.0);
+        ui->sizeLabel->setText(QLocale(QLocale::English).toString(m_handledSize) + "/" + QLocale(QLocale::English).toString(m_fileSize) + " Bytes");
+    }
+    else
+        ui->sizeLabel->setText(QLocale(QLocale::English).toString(m_handledSize) + " Bytes");
 }
 
 bool FileTab::receiving()
@@ -309,7 +315,7 @@ void FileTab::onStartResultArrived(bool result)
     m_working = result;
     if(result)
     {
-        if(ui->receiveModeButton->isChecked() && currentProtocol() == FileXceiver::RawProtocol)
+        if(ui->receiveModeButton->isChecked() && currentProtocol() == FileXceiver::RawProtocol && ui->RawRx_autostopNoneButton->isChecked())
             ui->progressBar->setMaximum(0);
         setParameterWidgetEnabled(false);
         ui->startStopButton->setText(tr("Stop"));
@@ -333,13 +339,26 @@ void FileTab::stop()
 
 void FileTab::updateFileSize()
 {
-    if(ui->receiveModeButton->isChecked() && currentProtocol() == FileXceiver::RawProtocol)
-        ui->sizeLabel->setText("");
+    m_fileSize = -1;
+    if(ui->receiveModeButton->isChecked())
+    {
+        if(currentProtocol() == FileXceiver::RawProtocol)
+        {
+            if(ui->RawRx_autostopByteButton->isChecked())
+                m_fileSize = ui->RawRx_autostopByteBox->currentText().toLongLong();
+            else
+                m_fileSize = -1;
+        }
+    }
     else
     {
         m_fileSize = QFileInfo(ui->filePathEdit->text()).size();
-        ui->sizeLabel->setText(QLocale(QLocale::English).toString(m_fileSize) + " Bytes");
     }
+
+    if(m_fileSize == -1)
+        ui->sizeLabel->setText("");
+    else
+        ui->sizeLabel->setText(QLocale(QLocale::English).toString(m_handledSize) + "/" + QLocale(QLocale::English).toString(m_fileSize) + " Bytes");
 }
 
 void FileTab::setParameterWidgetEnabled(bool state)

src/filexceiver.cpp

@@ -6,7 +6,7 @@
 FileXceiver::FileXceiver(QObject *parent)
     : QObject{parent}
 {
-    qRegisterMetaType<qsizetype>();
+    qRegisterMetaType<qsizetype>("qsizetype"); // qsizetype is an alias, so the typeName is compulsory
     qRegisterMetaType<FileXceiver::Protocol>();
     qRegisterMetaType<FileXceiver::ThrottleArgument>();
     m_file.setParent(this); // for moveToThread()
@@ -89,19 +89,19 @@ void FileXceiver::newData(const QByteArray &data)
     if(m_protocol == RawProtocol)
     {
         qsizetype num;
-        qsizetype limit = -1;
+        qsizetype limit = -1, currNum = -1;
         if(m_expectedNum != -1)
         {
             limit = m_expectedNum - m_handledNum;
-            limit = limit < data.size() ? limit : data.size();
-            num = m_file.write(data.constData(), limit);
+            currNum = limit < data.size() ? limit : data.size();
+            num = m_file.write(data.constData(), currNum);
         }
         else
             num = m_file.write(data);
         m_file.flush();
         m_handledNum += num;
         emit dataReceived(num);
-        if(m_expectedNum != -1 && limit != data.size())
+        if(m_expectedNum != -1 && currNum == limit)
             emit finished();
     }
 }

src/filexceiver.h

@@ -66,6 +66,7 @@ public slots:
 };
 
 Q_DECLARE_METATYPE(qsizetype)
+Q_DECLARE_METATYPE(FileXceiver::Protocol)
 Q_DECLARE_METATYPE(FileXceiver::ThrottleArgument)
 
 #endif // FILEXCEIVER_H