From: TrillGates Date: Fri, 31 Dec 2021 07:47:10 +0000 (+0800) Subject: 处理语音的保存问题 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=8b757d40b0856413b418165c50bafe847c1e7eec;p=icsupport.git 处理语音的保存问题 --- diff --git a/app/src/main/java/com/enqualcomm/support/bean/voicePacket.java b/app/src/main/java/com/enqualcomm/support/bean/voicePacket.java index fa2c051c..38c1f7a4 100644 --- a/app/src/main/java/com/enqualcomm/support/bean/voicePacket.java +++ b/app/src/main/java/com/enqualcomm/support/bean/voicePacket.java @@ -1,5 +1,7 @@ package com.enqualcomm.support.bean; +import com.ic.iclooger.ICLogger; + import java.util.ArrayList; import java.util.Iterator; @@ -133,8 +135,10 @@ public class voicePacket { packetFund = true; } } - if (packetFund) + if (packetFund) { return false; + } + ICLogger.d("add voice package " + _currentId); packetArray.add(new voicepacketItem(_currentId, _packetLen, _packetData)); } return ret; @@ -215,7 +219,6 @@ public class voicePacket { } else { return null; } - } public String getName() { diff --git a/app/src/main/java/com/ic/protocols/protocol_beehome.java b/app/src/main/java/com/ic/protocols/protocol_beehome.java index 9ca5b74d..cc997252 100644 --- a/app/src/main/java/com/ic/protocols/protocol_beehome.java +++ b/app/src/main/java/com/ic/protocols/protocol_beehome.java @@ -1647,10 +1647,13 @@ public class protocol_beehome { if (msg.length >= 6) { try { - name = msg[1]; - if (TextUtils.isEmpty(name)) { - name = "group"; - } + String originalName = msg[1]; +// if (TextUtils.isEmpty(originalName)) { +// name = "group"; +// } else { +// name = Util.decodeUnicode2Utf8(originalName); +// } + name = "group"; appendIndex = msg[2]; packetCount = Integer.parseInt(msg[3]); currentId = Integer.parseInt(msg[4]); @@ -1663,10 +1666,10 @@ public class protocol_beehome { .append(",packetCount = ").append(packetCount) .append(",currentId = ").append(currentId) .append(",packetLen = ").append(packetLen) - .append(",packetDatalen = ").append(packetData.length); + .append(",packetDataLen = ").append(packetData.length); log(stringBuffer.toString()); - connection.send(AP28(name, appendIndex, packetCount, currentId, 1)); + connection.send(AP28(originalName, appendIndex, packetCount, currentId, 1)); voicePacket.getInstance().appendVoice(name, appendIndex, packetCount, currentId, packetLen, packetData); log("================" + voicePacket.getInstance().toString()); if (voicePacket.getInstance().isFinished()) { @@ -1674,7 +1677,7 @@ public class protocol_beehome { String amrFilepath = Util.saveFile(voicePacket.getInstance().getVoicePacketBytes(), 0, voicePacket.getInstance().getVoicePacketLen(), new File(dir), "receive_" + voicePacket.getInstance().getPacketTime() + ".amr"); ICLogger.i("save Amr file to " + amrFilepath); voicePacket.getInstance().clearPacket(); - message2Db("0", amrFilepath, ICDatabaseHelper.MessageType.VOICE); + message2Db("", amrFilepath, ICDatabaseHelper.MessageType.VOICE); connection.DeliverCMDMessageToSystem("NewVoice", amrFilepath);//通知下面线程状态变化 } } catch (Exception e) { @@ -2684,7 +2687,10 @@ public class protocol_beehome { } public boolean handleCmd(CMD_TYPE type, String cmd) { - + if (type == null) { + ICLogger.d("type is null ==> " + cmd); + return false; + } //普通非二进制命令用此函数处理 boolean ret = true; ICLogger.i("handleCmd " + type.name() + " strLen=" + cmd.length());