处理语音的保存问题
authorTrillGates <williamtrillgates@gmail.com>
Fri, 31 Dec 2021 07:47:10 +0000 (15:47 +0800)
committerTrillGates <williamtrillgates@gmail.com>
Fri, 31 Dec 2021 07:47:10 +0000 (15:47 +0800)
app/src/main/java/com/enqualcomm/support/bean/voicePacket.java
app/src/main/java/com/ic/protocols/protocol_beehome.java

index fa2c051..38c1f7a 100644 (file)
@@ -1,5 +1,7 @@
 package com.enqualcomm.support.bean;\r
 \r
+import com.ic.iclooger.ICLogger;\r
+\r
 import java.util.ArrayList;\r
 import java.util.Iterator;\r
 \r
@@ -133,8 +135,10 @@ public class voicePacket {
                     packetFund = true;\r
                 }\r
             }\r
-            if (packetFund)\r
+            if (packetFund) {\r
                 return false;\r
+            }\r
+            ICLogger.d("add voice package " + _currentId);\r
             packetArray.add(new voicepacketItem(_currentId, _packetLen, _packetData));\r
         }\r
         return ret;\r
@@ -215,7 +219,6 @@ public class voicePacket {
         } else {\r
             return null;\r
         }\r
-\r
     }\r
 \r
     public String getName() {\r
index 9ca5b74..cc99725 100644 (file)
@@ -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());