From: TrillGates Date: Tue, 21 Dec 2021 07:59:57 +0000 (+0800) Subject: 对接了语音上传的功能 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=1ced6cd5f05c9233e8db99da3189b184a7daa59d;p=icsupport.git 对接了语音上传的功能 --- diff --git a/app/src/main/java/com/enqualcomm/support/service/Deliver.java b/app/src/main/java/com/enqualcomm/support/service/Deliver.java index 7c74ba94..d1efd691 100644 --- a/app/src/main/java/com/enqualcomm/support/service/Deliver.java +++ b/app/src/main/java/com/enqualcomm/support/service/Deliver.java @@ -435,8 +435,7 @@ public class Deliver extends AbstractConnectionService { voicepacket.getVoicePacketWithIndex(voicepacket.getCurrentIndexToSent()).getPacketLen(), voicepacket.getVoicePacketWithIndex(voicepacket.getCurrentIndexToSent()).getPacketData(), voicepacket.getFiletype(), - voicepacket.getDateType(), - voicepacket.getSender()) + voicepacket.getDateType()) ); } } else { diff --git a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java index 44e74410..b17ad87e 100644 --- a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java +++ b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java @@ -691,27 +691,27 @@ public class protocolAPIHelper { public static byte[] getVoicePacketItem(String sender, String durationHEX, String packetTime, int count, int index, - int datalen, byte[] amrdata, - int filetype, int datatype, String targetNumber) { + int dataLen, byte[] amrData, + int fileType, int dataType) { byte[] ret = null; if (is_protocol_not_Initialled()) return null; switch (Config.protocol_no) { case Config.PROTOCOL_JIAI: - ret = protocol_jiai.AP07(packetTime, count, index, datalen, amrdata); + ret = protocol_jiai.AP07(packetTime, count, index, dataLen, amrData); break; case Config.PROTOCOL_BEEHOME: - ret = protocol_beehome.AP07(packetTime, count, index, datalen, amrdata, targetNumber); + ret = protocol_beehome.AP07(packetTime, count, index, dataLen, amrData); break; case Config.PROTOCOL_IC: /*** * * 1 语音—— 1.监听语音 * 2.SOS语音 * 3.扩展 * * 2 图片—— 1.签到图片 * 2.指令图片 * 3.设备图片 * 4.扩展 */ - if (filetype == 1 && datatype == 3) { + if (fileType == 1 && dataType == 3) { //对讲用的类型 - ret = protocol_ic.AP07(packetTime, count, index, datalen, amrdata); + ret = protocol_ic.AP07(packetTime, count, index, dataLen, amrData); } else { - ret = protocol_ic.APTU(packetTime, filetype, datatype, count, index, datalen, amrdata); + ret = protocol_ic.APTU(packetTime, fileType, dataType, count, index, dataLen, amrData); } break; case Config.PROTOCOL_FZD: @@ -721,22 +721,22 @@ public class protocolAPIHelper { ret = null;//protocol_fzd.AP07(packetTime,count,index,datalen,amrdata); break; case PROTOCOL_ANAN: - ret = protocol_anan.AP07(packetTime, count, index, datalen, amrdata); + ret = protocol_anan.AP07(packetTime, count, index, dataLen, amrData); break; case Config.PROTOCOL_S123: /*** * * 1 语音—— 1.监听语音 * 2.SOS语音 * 3.扩展 * * 2 图片—— 1.签到图片 * 2.指令图片 * 3.设备图片 * 4.扩展 */ - if (filetype == 1 && datatype == 3) { + if (fileType == 1 && dataType == 3) { //对讲用的类型 - ret = protocol_s123.AP07(packetTime, count, index, datalen, amrdata); + ret = protocol_s123.AP07(packetTime, count, index, dataLen, amrData); } else { - ret = protocol_s123.APTU(packetTime, filetype, datatype, count, index, datalen, amrdata); + ret = protocol_s123.APTU(packetTime, fileType, dataType, count, index, dataLen, amrData); } break; case Config.PROTOCOL_GATOR: - ret = protocol_gator.BP34_Raw(sender, packetTime, durationHEX, count, index, datalen, amrdata); + ret = protocol_gator.BP34_Raw(sender, packetTime, durationHEX, count, index, dataLen, amrData); break; } return ret; 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 2db41a1e..580aa794 100644 --- a/app/src/main/java/com/ic/protocols/protocol_beehome.java +++ b/app/src/main/java/com/ic/protocols/protocol_beehome.java @@ -1207,37 +1207,35 @@ public class protocol_beehome { // } - public static byte[] AP07(String packetTime, int count, int index, - int datalen, byte[] amrdata, String targetNum) { - //IWAP07,080835,20140818064408 ,135xxx,6,1,1024,XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX# - //- IW:标识符 - //- AP07 : 命令字符 - //- 080835:流水号 - //- 20140818064408 :yyyyMMddHHmmss 格式的年月日时分秒,设备录音时间 - //- 135xxx:目标联系人号,0表示群聊(我要发给谁) - //- 6:语音包分包总数 - //- 1 :当前包数,第一包为1,第二包为2,。。。。。。同一个语音包的语音时间相同 - //- 1024 :语音包长度 - //- XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX:当前音频数据, 每个音频数据包大小为1024字节,最后一包不足1024的取实际字节数 - //- 语音包上传规则: - // - 按包次序依次上传,上传后如果没有收到服务器的响应包,则继续上传该语音包。 - // - 收到设备回复确认数据包接收成功状态后,继续开始依次上传下一个数据包。。。。。。 - // - 如果设备回复确认数据包接收失败状态,则重复发送上一个数据包 + + public static byte[] AP07(String packetTime, int count, int index, int dataLen, byte[] amrData) { + //IWAP07,20140818064408,6,1,1024,XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX# + //说明: + //IW:标识符 + //AP07 : 命令字符 + //20140818064408 :yyyyMMddHHmmss 格式的年月日时分秒,设备录音时间 + //6:语音包分包总数 + //1 :当前包数,第一包为1,第二包为2,。。。。。。同一个语音包的语音时间相同 + //1024 :语音包长度 + //XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX:当前音频数据, 每个音频数据包大小为1024字节,最后一包不足1024的取实际字节数 + //语音包上传规则: + //按包次序依次上传,上传后如果没有收到服务器的响应包,则继续上传该语音包。 + //收到设备回复确认数据包接收成功状态后,继续开始依次上传下一个数据包。。。。。。 + //如果设备回复确认数据包接收失败状态,则重复发送上一个数据包 String sb = new StringBuffer(CMDHEADER).append(cmdStrMap.get(CMD_TYPE.AP07)) - .append(CMDSPLIT).append(TimeUtil.getUTCSystemTimeHHmmss()) .append(CMDSPLIT).append(packetTime) - .append(CMDSPLIT).append(targetNum) .append(CMDSPLIT).append(count) .append(CMDSPLIT).append(index) - .append(CMDSPLIT).append(datalen) + .append(CMDSPLIT).append(dataLen) .append(CMDSPLIT).toString(); - byte[] sentBuf = new byte[sb.length() + datalen + 1]; + byte[] sentBuf = new byte[sb.length() + dataLen + 1]; System.arraycopy(sb.getBytes(), 0, sentBuf, 0, sb.length()); - System.arraycopy(amrdata, 0, sentBuf, sb.length(), datalen); - sentBuf[sb.length() + datalen] = '#'; - ICLogger.d("sent buf ==> " + new String(sentBuf)); + System.arraycopy(amrData, 0, sentBuf, sb.length(), dataLen); + sentBuf[sb.length() + dataLen] = '#'; + return sentBuf; + }