1.3.0

wittybaji · May 16, 2024 · 5b9de76 · 5b9de76
1 parent c34db9c
commit 5b9de76
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/HybridFileXfer-Android/app/release/app-release.apk b/HybridFileXfer-Android/app/release/app-release.apk
diff --git a/...dFileXfer-Android/app/src/main/java/top/weixiansen574/hybridfilexfer/core/ServerInfo.java b/...dFileXfer-Android/app/src/main/java/top/weixiansen574/hybridfilexfer/core/ServerInfo.java
@@ -6,5 +6,6 @@ public interface ServerInfo {
     int PORT_USB = 5741;
     int PORT_WIFI = 5742;
     int 酷安飞机杯 = 8964;
+    int 晨钟酱操飞机杯 = 0x2304;//我不会忘记我在2023-05-06那天，我看到你在酷安发涩图与其同流合污（虽然你删了）
 
 }
diff --git a/HybridFileXfer-PC/src/top/weixiansen574/hybridfilexfer/core/ServerInfo.java b/HybridFileXfer-PC/src/top/weixiansen574/hybridfilexfer/core/ServerInfo.java
@@ -6,5 +6,6 @@ public interface ServerInfo {
     int PORT_USB = 5741;
     int PORT_WIFI = 5742;
     int 酷安飞机杯 = 8964;
+    int 晨钟酱操飞机杯 = 0x2304;//我不会忘记我在2023-05-06那天，我看到你在酷安发涩图与其同流合污（虽然你删了）
 
 }
diff --git a/...FileXfer-PC/src/top/weixiansen574/hybridfilexfer/core/threads/ClientControllerThread.java b/...FileXfer-PC/src/top/weixiansen574/hybridfilexfer/core/threads/ClientControllerThread.java
@@ -34,11 +34,9 @@ public class ClientControllerThread extends Thread implements TransferThread.OnE
     JobPublisher jobPublisher;
     SendThread usbSendThread;
     SendThread wifiSendThread;
-    BlockingDeque<FileTransferEvent> fileTransferEvents;
 
     public ClientControllerThread() {
         jobPublisher = new JobPublisher();
-        fileTransferEvents = new LinkedBlockingDeque<>();
     }
 
     @Override
@@ -74,20 +72,20 @@ public void run() {
             Socket usbSocket = new Socket(InetAddress.getLoopbackAddress(), ServerInfo.PORT_USB);//USB-ADB forward的端口是本地127.0.0.1
 
             //接收线程只管接收
-            usbReceiveThread = new ReceiveThread(fileTransferEvents, ReceiveThread.DEVICE_USB, usbSocket.getInputStream());
+            usbReceiveThread = new ReceiveThread(null, ReceiveThread.DEVICE_USB, usbSocket.getInputStream());
             usbReceiveThread.setName("usbReceive");
             usbReceiveThread.setOnExceptionListener(this);
             usbReceiveThread.start();
-            wifiReceiveThread = new ReceiveThread(fileTransferEvents, ReceiveThread.DEVICE_WIFI, wifiSocket.getInputStream());
+            wifiReceiveThread = new ReceiveThread(null, ReceiveThread.DEVICE_WIFI, wifiSocket.getInputStream());
             wifiReceiveThread.setName("wifiReceive");
             wifiReceiveThread.setOnExceptionListener(this);
             wifiReceiveThread.start();
 
-            usbSendThread = new SendThread(fileTransferEvents, SendThread.DEVICE_USB, jobPublisher, usbSocket.getOutputStream());
+            usbSendThread = new SendThread(null, SendThread.DEVICE_USB, jobPublisher, usbSocket.getOutputStream());
             usbSendThread.setName("usbSend");
             usbSendThread.setOnExceptionListener(this);
             usbSendThread.start();
-            wifiSendThread = new SendThread(fileTransferEvents, SendThread.DEVICE_WIFI, jobPublisher, wifiSocket.getOutputStream());
+            wifiSendThread = new SendThread(null, SendThread.DEVICE_WIFI, jobPublisher, wifiSocket.getOutputStream());
             wifiSendThread.setName("wifiSend");
             wifiSendThread.setOnExceptionListener(this);
             wifiSendThread.start();

diff --git a/HybridFileXfer-PC/src/top/weixiansen574/hybridfilexfer/core/threads/TransferThread.java b/HybridFileXfer-PC/src/top/weixiansen574/hybridfilexfer/core/threads/TransferThread.java
@@ -23,7 +23,9 @@ public long getAndResetTransferredBytes(){
     }
 
     protected void addEvent(int state, String desc){
-        events.add(new FileTransferEvent(state,device,desc));
+        if(events != null) {
+            events.add(new FileTransferEvent(state, device, desc));
+        }
     }
 
     public void setOnExceptionListener(OnExceptionListener onExceptionListener) {