修复mac间无法发送文件的问题

feiqlib/feiqengine.cpp

@@ -69,7 +69,9 @@ public:
         <<sep
         <<content->modifyTime
         <<sep
-        <<content->fileType;
+        <<content->fileType
+        <<sep
+        <<FILELIST_SEPARATOR;
     }
 };
 
@@ -332,9 +334,11 @@ public:
                 break;
 
             auto content = createFileContent(found, endTask);
-            content->packetNo = stoul(post->packetNo);
             if (content != nullptr)
+            {
+                content->packetNo = stoul(post->packetNo);
                 post->contents.push_back(shared_ptr<Content>(std::move(content)));
+            }
 
             found = ++endTask;
         }
@@ -610,6 +614,7 @@ bool FeiqEngine::downloadFile(FileTask* task)
         }
 
         fclose(of);
+        task->setProcess(total);
         task->setState(FileTaskState::Finish);
     };
 

feiqlib/filetask.cpp

@@ -22,7 +22,8 @@ void FileTask::setObserver(IFileTaskObserver *observer)
 void FileTask::setProcess(int val)
 {
     mProcess = val;
-    if (mProcess - mLastProcess >= mNotifySize)
+    if (mProcess - mLastProcess >= mNotifySize
+        || mProcess >= mContent->size)
     {
         mLastProcess = mProcess;
         mObserver->onProgress(this);

feiqlib/ipmsg.h

@@ -129,7 +129,7 @@
 #define IPMSG_FILE_ALIASFNAME 0x00000040    // alias fname
 #define IPMSG_FILE_UNICODEFNAME 0x00000041    // UNICODE fname
 
-#define FILELIST_SEPARATOR 0x7
+#define FILELIST_SEPARATOR (char)0x7
 #define HOSTLIST_DUMMY (char)0x8
 #define HLIST_ENTRY_SEPARATOR (char)0x3a