完善局域网文件传输功能

1.修复在Windows下无法正常读取文件的问题 2.提高组网稳定性
188080501 · Oct 14, 2016 · c8c6ce9 · c8c6ce9
1 parent 0d51506
commit c8c6ce9
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 5 deletions.
diff --git a/JQTools.pro b/JQTools.pro
diff --git a/README.md b/README.md
diff --git a/components/ToolsGroup/LanFileTransport/cpp/lanfiletransport_.cpp b/components/ToolsGroup/LanFileTransport/cpp/lanfiletransport_.cpp
@@ -159,6 +159,8 @@ QString Manage::savePath()
 
 void Manage::refreshLanNodes()
 {
+    qDebug() << "refreshLanNodes";
+
     mutex_.lock();
 
     lanNodes_.clear();

diff --git a/components/ToolsGroup/LanFileTransport/qml/LanFileTransport.qml b/components/ToolsGroup/LanFileTransport/qml/LanFileTransport.qml
@@ -118,11 +118,17 @@ Item {
                     for( var index = 0; index < drop.urls.length; ++index )
                     {
                         var url = drop.urls[ index ].toString();
-                        print( url );
 
                         if ( url.indexOf( "file://" ) !== 0 ) { return; }
 
-                        filePaths.push( url.substr( 7 ) );
+                        if ( Qt.platform.os === "windows" )
+                        {
+                            filePaths.push( url.substr( 8 ) );
+                        }
+                        else
+                        {
+                            filePaths.push( url.substr( 7 ) );
+                        }
                     }
 
                     var transportResult = lanFileTransportManage.transport( hostAddress, filePaths );

diff --git a/lib/JQNetwork/include/jqnetwork_lan.h b/lib/JQNetwork/include/jqnetwork_lan.h
@@ -23,8 +23,8 @@ struct JQNetworkLanSettings
     QHostAddress multicastGroupAddress;
     quint16 bindPort = 0;
 
-    int checkLoopInterval = 15 * 1000;
-    int lanNodeTimeoutInterval = 45 * 1000;
+    int checkLoopInterval = 10 * 1000;
+    int lanNodeTimeoutInterval = 60 * 1000;
 
     std::function< void( const JQNetworkLanNode & ) > lanNodeOnlineCallback;
     std::function< void( const JQNetworkLanNode & ) > lanNodeActiveCallback;

diff --git a/lib/JQNetwork/src/jqnetwork_lan.cpp b/lib/JQNetwork/src/jqnetwork_lan.cpp
@@ -281,6 +281,7 @@ void JQNetworkLan::checkLoop()
 
     if ( lanListModified )
     {
+//        qDebug("111111");
         this->onLanNodeListChanged();
     }
 
@@ -373,6 +374,7 @@ void JQNetworkLan::onUdpSocketReadyRead()
 
                 this->onLanNodeStateOnline( lanNode );
                 this->onLanNodeListChanged();
+//                qDebug("222222");
 
                 firstOnline = true;
             }

diff --git a/lib/JQToolsLibrary/include/JQToolsLibrary.h b/lib/JQToolsLibrary/include/JQToolsLibrary.h
@@ -16,7 +16,7 @@
 // Qt lib import
 #include <QObject>
 
-#define JQTOOLS_VERSIONSTRING "16.10.12"
+#define JQTOOLS_VERSIONSTRING "16.10.14"
 
 class AbstractTool: public QObject
 {