protocol_ic 添加 APTU图片和音频传输支持

diff --git a/app/src/main/java/com/enqualcomm/support/Config.java b/app/src/main/java/com/enqualcomm/support/Config.java
index 2dbddfa..3f26e3b 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/Config.java
+++ b/app/src/main/java/com/enqualcomm/support/Config.java
@@ -357,6 +357,7 @@ public class Config {
         noTempSensor=true;\r
         if (c43_branch_name.equals("l05")) {\r
           SOSNoNeedDial=true;\r
+          noPPGSensor=false;\r
         }else{\r
           noPPGSensor=true;\r
         }\r

diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java
index 9a2e5df..9e8715b 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -698,7 +698,6 @@ public class CoreService extends Service {
                     ICLogger.i("SitCheck 平均每分钟活动数大于参考值，则重置 lastCheckSitTime 以及 lastSitCheckStepCount");\r
                     Runtime.lastSitCheckStepCount=runtime.getTotalStepCount();\r
                     Runtime.lastSitCheckTiimeyyyyMMddHHmmss=TimeUtil.getSystemTime3();\r
-\r
                 }\r
             }\r
         }else{\r

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 210f009..92add63 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/bean/voicePacket.java
+++ b/app/src/main/java/com/enqualcomm/support/bean/voicePacket.java
@@ -59,6 +59,14 @@ public class voicePacket {
         filetype=type;\r
         datatype=dtype;\r
     }\r
+\r
+\r
+    public int getFiletype(){\r
+        return filetype;\r
+    }\r
+    public int getDateType(){\r
+        return datatype;\r
+    }\r
     ArrayList<voicepacketItem> packetArray =new ArrayList<voicepacketItem>();\r
     public class voicepacketItem{\r
         int currentId;\r

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 82ffa6e..587ec45 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/service/Deliver.java
+++ b/app/src/main/java/com/enqualcomm/support/service/Deliver.java
@@ -340,16 +340,16 @@ public static void sendLocationMSG( String Msg){
       //收到SentVoicePacket 表示 有一个VoiceMessage要发送，需要从第0个包开始发送语音分包。\r
       voicePacket voicepacket = voicePacket.getInstanceSent();\r
       if (voicepacket.getCurrentIndexToSent() < voicepacket.getPacketCount()) {\r
-        ICLogger.i("voicepacket " + voicepacket.getName() + " " + voicepacket.getPacketTime() + " send " + (voicepacket.getCurrentIndexToSent() + 1) + "/" + voicepacket.getPacketCount());\r
+        ICLogger.i("voicepacket " + voicepacket.getName() +" filetype "+voicepacket.getFiletype()+ " , datatype "+ voicepacket.getDateType() + voicepacket.getPacketTime() + " send " + (voicepacket.getCurrentIndexToSent() + 1) + "/" + voicepacket.getPacketCount());\r
         ((NettyConnection) mConnection).sendMsg(\r
                 protocolAPIHelper.getVoicePacketItem(voicepacket.getPacketTime(),\r
                         voicepacket.getPacketCount(),\r
                         (voicepacket.getCurrentIndexToSent() + 1),\r
                         voicepacket.getVoicePacketWithIndex(voicepacket.getCurrentIndexToSent()).getPacketLen(),\r
-                        voicepacket.getVoicePacketWithIndex(voicepacket.getCurrentIndexToSent()).getPacketData())\r
+                        voicepacket.getVoicePacketWithIndex(voicepacket.getCurrentIndexToSent()).getPacketData(),voicepacket.getFiletype(),voicepacket.getDateType())\r
         );\r
       } else {\r
-        ICLogger.i("voicepacket " + voicepacket.getName() + " " + voicepacket.getPacketTime() + " sent Done!");\r
+        ICLogger.i("voicepacket " + voicepacket.getName() +" filetype "+voicepacket.getFiletype()+ " , datatype "+ voicepacket.getDateType()+ " " + voicepacket.getPacketTime() + " sent Done!");\r
       }\r
       return true;\r
     } else if ("poweroffCheckSim".equals(paramStringMessage.cmd())) {\r

diff --git a/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java b/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
index b0d52f8..7b174a2 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
@@ -267,10 +267,14 @@ public class ProcessReceiver extends BroadcastReceiver {
       String msgUrl=paramIntent.getStringExtra(KEY_MESSAGE_URL);\r
     ICLogger.i("receive msg to send type="+msgType+", msg from = "+msgFrom+", msgUrl"+msgUrl);\r
     if (msgFrom==null) msgFrom="123";\r
+      /**\r
+       *        * 1 语音——       1.监听语音      *   2.SOS语音      *      3.扩展\r
+       *          * 2 图片——     1.签到图片      *   2.指令图片      *   3.设备图片      *   4.扩展\r
+       */\r
       if (msgType.equals("voice"))\r
       {\r
         //创建voiceConent并添加到数据\r
-        final VoiceContent voiceContent = VoiceContent.placeHolderOut(CONTACT_CATEGORY_GROUP, msgFrom, msgUrl);\r
+        final VoiceContent voiceContent = VoiceContent.placeHolderOut(CONTACT_CATEGORY_GROUP, msgFrom, msgUrl,1,3);\r
 \r
         // 把voiceContent拆解成1024的分包\r
         Util.parseToVoicePacketSent(voiceContent);\r
@@ -279,7 +283,7 @@ public class ProcessReceiver extends BroadcastReceiver {
           CoreService.getInstance().getConnection().DeliverCMDMessageToSystem("SentVoicePacket", "");\r
       }else if (msgType.equals("pic")){\r
         //创建voiceConent并添加到数据\r
-        final VoiceContent voiceContent = VoiceContent.placeHolderOut(CONTACT_CATEGORY_GROUP, msgFrom, msgUrl,2,1);\r
+        final VoiceContent voiceContent = VoiceContent.placeHolderOut(CONTACT_CATEGORY_GROUP, msgFrom, msgUrl,2,3);\r
 \r
         // 把voiceContent拆解成1024的分包\r
         Util.parseToVoicePacketSent(voiceContent);\r

diff --git a/app/src/main/java/com/enqualcomm/support/utils/Util.java b/app/src/main/java/com/enqualcomm/support/utils/Util.java
index e655c51..b787f2e 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/utils/Util.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/Util.java
@@ -811,8 +811,9 @@ public class Util {
       int count= (int)(filesize/1024);\r
       if ((filesize%1024)>0)\r
           count++;\r
-      ICLogger.i("File "+voiceContent.content+", size "+filesize+", count "+count);\r
+      ICLogger.i("File "+voiceContent.content+", size "+filesize+", count "+count + " filetype "+voiceContent.filetype + ", datatype "+voiceContent.datatype);\r
       voicePacket.getInstanceSent().clearPacket();\r
+      voicePacket.getInstanceSent().setFileType(voiceContent.filetype,voiceContent.datatype);\r
       try {\r
         FileInputStream fis = new FileInputStream(voicefile);\r
         byte[] audiobuf = new byte[1024];\r

diff --git a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java
index d964d00..14ad187 100644 (file)
--- a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java
+++ b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java
@@ -229,7 +229,7 @@ public class protocolAPIHelper {
         return ret;\r
     }\r
 \r
-    public static byte[] getVoicePacketItem(String  packetTime,int count,int index,int datalen,byte[] amrdata){\r
+    public static byte[] getVoicePacketItem(String  packetTime,int count,int index,int datalen,byte[] amrdata,int filetype,int datatype){\r
         byte[] ret=null;\r
         if (is_protocol_not_Initialled()) return null;\r
         switch(Config.protocol_no)\r
@@ -241,7 +241,7 @@ public class protocolAPIHelper {
                 ret=protocol_beehome.AP07(packetTime,count,index,datalen,amrdata);\r
                 break;\r
             case Config.PROTOCOL_IC:\r
-                ret=protocol_ic.APTU(packetTime,1,1,count,index,datalen,amrdata);\r
+                ret=protocol_ic.APTU(packetTime,filetype,datatype,count,index,datalen,amrdata);\r
                 break;\r
             case Config.PROTOCOL_FZD:\r
                 ret=null;//protocol_fzd.AP07(packetTime,count,index,datalen,amrdata);\r