From: xiewei <892331662@qq.com> Date: Fri, 25 Apr 2025 09:43:57 +0000 (+0800) Subject: 250425:新增服务器分包处理 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=da8b38aac7e11e9ca0402fc849ba8b4861f6f61c;p=mirrors%2Fhs-sdk.git 250425:新增服务器分包处理 --- diff --git a/hssdk/src/main/java/com/zhixun/blesdk/hssdk/alisocket/SocketClient.java b/hssdk/src/main/java/com/zhixun/blesdk/hssdk/alisocket/SocketClient.java index 444dc33..15a7634 100644 --- a/hssdk/src/main/java/com/zhixun/blesdk/hssdk/alisocket/SocketClient.java +++ b/hssdk/src/main/java/com/zhixun/blesdk/hssdk/alisocket/SocketClient.java @@ -1,7 +1,12 @@ package com.zhixun.blesdk.hssdk.alisocket; +import android.os.Handler; +import android.os.Looper; +import android.os.Message; import android.os.SystemClock; +import androidx.annotation.NonNull; + import com.zhixun.blesdk.hssdk.bttools.ByteTools; import com.zhixun.blesdk.hssdk.callback.OnSocketListener; import com.zhixun.blesdk.hssdk.util.SobLog; @@ -28,6 +33,23 @@ public class SocketClient { private int serverPort; private OutputStream socketOut; private String TAG = "SocketClient"; + private Handler handler = new Handler(Looper.myLooper()){ + @Override + public void handleMessage(@NonNull Message msg) { + super.handleMessage(msg); + switch (msg.what){ + case 101: + byte[] arrayOfByte = (byte[]) msg.obj; + if (arrayOfByte.length > 0 && onSocketListener != null) { + // Process the entire content at once + SobLog.d(TAG,"receiver --"+ ByteTools.byteArrToHex(arrayOfByte)); + onSocketListener.onMessageReceived(arrayOfByte); + } + cacheData = new byte[0]; + break; + } + } + }; public void setSocketListener(OnSocketListener onSocketListener) { this.onSocketListener = onSocketListener; } @@ -70,6 +92,7 @@ public class SocketClient { }).start(); } + private byte[] cacheData = new byte[0]; public void startReadMsg() { new Thread(new Runnable() { @Override @@ -80,15 +103,16 @@ public class SocketClient { while (!socket.isClosed()) { if (mInputStream.available() > 0) { - SobLog.d(TAG,"receiver size--"+mInputStream.available()); + handler.removeMessages(101); + byte[] arrayOfByte = new byte[mInputStream.available()]; mInputStream.read(arrayOfByte); + SobLog.d(TAG,"receiver size--"+arrayOfByte.length); + cacheData = ByteTools.concatAll(cacheData,arrayOfByte); + Message message = handler.obtainMessage(101); + message.obj = cacheData; + handler.sendMessageDelayed(message,200); - if (arrayOfByte.length > 0 && onSocketListener != null) { - // Process the entire content at once - SobLog.d(TAG,"receiver --"+ ByteTools.byteArrToHex(arrayOfByte)); - onSocketListener.onMessageReceived(arrayOfByte); - } } diff --git a/hssdk/src/main/java/com/zhixun/blesdk/hssdk/data/BleMsgSendHandler.java b/hssdk/src/main/java/com/zhixun/blesdk/hssdk/data/BleMsgSendHandler.java index 35babdd..0484062 100644 --- a/hssdk/src/main/java/com/zhixun/blesdk/hssdk/data/BleMsgSendHandler.java +++ b/hssdk/src/main/java/com/zhixun/blesdk/hssdk/data/BleMsgSendHandler.java @@ -61,6 +61,8 @@ public class BleMsgSendHandler { public void setMtu(int mtu) { if(mtu>514){ mtu = 512; + }else { + mtu = mtu-3; } this.mtu = mtu; } @@ -189,7 +191,7 @@ public class BleMsgSendHandler { byte[] childData = ByteTools.concatAll(ByteTools.hexToByteArr(head),pageNum,pageTotalLen, pageIndex,pageLen,childContent,crc); - SobLog.d(TAG,"childData--"+ByteTools.byteArrToHex(childData)); +// SobLog.d(TAG,"childData--"+ByteTools.byteArrToHex(childData)); queueMsg.add(childData); }