From c8c6ce98676abccaddd3d0bd8975d074ac5fd834 Mon Sep 17 00:00:00 2001
From: Jason <188080501@qq.com>
Date: Fri, 14 Oct 2016 12:23:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=B1=80=E5=9F=9F=E7=BD=91?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=BC=A0=E8=BE=93=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1.修复在Windows下无法正常读取文件的问题
2.提高组网稳定性
---
 JQTools.pro                                            |  0
 README.md                                              |  0
 .../LanFileTransport/cpp/lanfiletransport_.cpp         |  2 ++
 .../LanFileTransport/qml/LanFileTransport.qml          | 10 ++++++++--
 lib/JQNetwork/include/jqnetwork_lan.h                  |  4 ++--
 lib/JQNetwork/src/jqnetwork_lan.cpp                    |  2 ++
 lib/JQToolsLibrary/include/JQToolsLibrary.h            |  2 +-
 7 files changed, 15 insertions(+), 5 deletions(-)
 mode change 100755 => 100644 JQTools.pro
 mode change 100755 => 100644 README.md
 mode change 100755 => 100644 components/ToolsGroup/LanFileTransport/cpp/lanfiletransport_.cpp
 mode change 100755 => 100644 components/ToolsGroup/LanFileTransport/qml/LanFileTransport.qml
 mode change 100755 => 100644 lib/JQNetwork/include/jqnetwork_lan.h
 mode change 100755 => 100644 lib/JQNetwork/src/jqnetwork_lan.cpp
 mode change 100755 => 100644 lib/JQToolsLibrary/include/JQToolsLibrary.h

diff --git a/JQTools.pro b/JQTools.pro
old mode 100755
new mode 100644
diff --git a/README.md b/README.md
old mode 100755
new mode 100644
diff --git a/components/ToolsGroup/LanFileTransport/cpp/lanfiletransport_.cpp b/components/ToolsGroup/LanFileTransport/cpp/lanfiletransport_.cpp
old mode 100755
new mode 100644
index 7c0e4c3..7ade1fe
--- 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
old mode 100755
new mode 100644
index 25c67d6..d1da692
--- 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
old mode 100755
new mode 100644
index f3e1b3d..e973ef8
--- 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
old mode 100755
new mode 100644
index e95fcde..3e0993a
--- 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
old mode 100755
new mode 100644
index 26b7d2c..9c4d70f
--- 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
 {