From: snickersun <scy@incartech.cn>
Date: Thu, 23 Jul 2020 08:45:48 +0000 (+0800)
Subject: release 460
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.js?a=commitdiff_plain;h=5699c69bdfead5072b91768c6fc20001f39bb255;p=protocol_srv.git

release 460
1、修复sms 短信命令不能正确执行问题
2、添加了部分指令BPDE BPDF BPTU，但是没有完成,由于急着解决短信命令问题，先提交上去。
---

diff --git a/app/release/ICSer_V458_2007202005_release.apk b/app/release/ICSer_V458_2007202005_release.apk
deleted file mode 100644
index 3ffff84b..00000000
Binary files a/app/release/ICSer_V458_2007202005_release.apk and /dev/null differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ad5d05b8..2c209834 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -131,6 +131,7 @@
             android:exported="true">
             <intent-filter>
                 <action android:name="android.provider.Telephony.SMS_RECEIVED" />
+                <action android:name="com.enqualcomm.support.SMSCMD" />
             </intent-filter>
         </receiver>
         <receiver
diff --git a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
index 799f9598..5f6815a2 100644
--- a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
+++ b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
@@ -70,10 +70,14 @@ public class ICSmsManager  extends BroadcastReceiver{
     @Override
     public void onReceive(Context context, Intent intent) {
 
-        if (mContext==null) {
+        if (CoreService.getInstance()==null) {
             ICLogger.i("CoreService still not started , skip SMS cmd!");
             return;
         }
+        mContext=context;
+        runtime=CoreService.getInstance().runtime;
+
+
         String action = intent.getAction();
         if (ACTION_SMSCMD.equals(action)) {
             String cmd = intent.getStringExtra("smsCmd");
@@ -129,12 +133,15 @@ public class ICSmsManager  extends BroadcastReceiver{
             cell_number_to_reply="";
 
         }
+    }
+    public ICSmsManager( ) {
+
+
     }
 
     public ICSmsManager( Runtime _runtime) {
         this.runtime = _runtime;
         this.mContext = runtime.getContextProxy().context;
-
         IntentFilter intentfilter=new IntentFilter();
         intentfilter.addAction(ACTION_SMSCMD_Reply);
         this.mContext.registerReceiver(this,intentfilter);
diff --git a/app/src/main/java/com/enqualcomm/support/bean/SleepInfo.java b/app/src/main/java/com/enqualcomm/support/bean/SleepInfo.java
index 3176b15d..d053061e 100644
--- a/app/src/main/java/com/enqualcomm/support/bean/SleepInfo.java
+++ b/app/src/main/java/com/enqualcomm/support/bean/SleepInfo.java
@@ -57,7 +57,10 @@ public class SleepInfo {
      * @param turnovertime
      */
     public void append_sleep_check_item(int turnovertime){
-
+        System.currentTimeMillis();
+        if (turnovertime <= DEEP_TURN_LEVEL){
+            deepsleep_minutes+=step_for_each_record_in_minutes;
+        }
         turnovertimesArray.add(turnovertime);
     }
 
diff --git a/app/src/main/java/com/ic/protocols/protocol_ic.java b/app/src/main/java/com/ic/protocols/protocol_ic.java
index 8ccf1707..9e1151c8 100644
--- a/app/src/main/java/com/ic/protocols/protocol_ic.java
+++ b/app/src/main/java/com/ic/protocols/protocol_ic.java
@@ -115,6 +115,12 @@ public class protocol_ic {
         BPS4,//提醒设置(时间段)
         APHP,//上报心率血压血氧
         BPHP,
+        APDE,//进出围栏通知
+        BPDE,
+        APDF,//体温阀值设置
+        BPDF,
+        APTU,//上传语音图片
+        BPTU,
         UNKNOWN_CMD,
     }
 
@@ -196,6 +202,12 @@ public class protocol_ic {
         cmdMap.put(CMD_TYPE.BPS4, "BPS4");
         cmdMap.put(CMD_TYPE.APHP, "APHP");
         cmdMap.put(CMD_TYPE.BPHP, "BPHP");
+        cmdMap.put(CMD_TYPE.APDE, "APDE");
+        cmdMap.put(CMD_TYPE.BPDE, "BPDE");
+        cmdMap.put(CMD_TYPE.APDF, "APDF");
+        cmdMap.put(CMD_TYPE.BPDF, "BPDF");
+        cmdMap.put(CMD_TYPE.APTU, "APTU");
+        cmdMap.put(CMD_TYPE.BPTU, "BPTU");
 
     }
 
@@ -1824,6 +1836,115 @@ public class protocol_ic {
 
     }
 
+    public static String APDE(String id){
+        return new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.APS4))
+                .append(CMDSPLIT).append(id)
+                .append(CMDEND).toString();
+    }
+
+    public void handleBPDE(){
+
+
+
+    }
+    public static String APDF(String id){
+        return new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.APS4))
+                .append(CMDSPLIT).append(id)
+                .append(CMDEND).toString();
+    }
+
+    public void handleBPDF(){
+
+
+
+    }
+    public static String APTU(String id){
+        /**
+         * 10.设备录音图片（设备上行）（上行协议：APTU，响应：BPTU）
+         * 示例：
+         * IWAPTU,6654111,080835,1,1,6,1,1024,XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX#
+         * 说明：
+         * IW：标识符
+         * BPCU : 命令字符
+         * 6654111:语音图片文字目标 (同步监护人列表的用户唯一标识ID)<扩展字段目前不需要,可以传空字符>
+         * 080835 :指令流水号
+         * 1:文件类型
+         * 1:内容类型 类型说明如下表
+         * 文件类型	内容类型
+         * 1 语音——	1.监听语音      * 	2.SOS语音      * 	3.扩展
+         * 2 图片——	1.签到图片      * 	2.指令图片      * 	3.设备图片      * 	4.扩展
+         * 6：内容包分包总数
+         * 1 ：当前包数，第一包为1，第二包为2，。。。。。。同一个语音包的语音时间相同
+         * 1024 :语音包长度
+         * XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX：当前音频数据, 每个音频数据包大小为1024字节，最后一包不足1024的取实际字节数
+         * 语音包上传规则：
+         * 按包次序依次上传，上传后如果没有收到服务器的响应包，则继续上传该语音包。
+         * 收到设备回复确认数据包接收成功状态后，继续开始依次上传下一个数据包。。。。。。
+         * 如果设备回复确认数据包接收失败状态，则重复发送上一个数据包
+         */
+        return new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.APS4))
+                .append(CMDSPLIT).append(id)
+                .append(CMDEND).toString();
+    }
+
+    /**
+     * 主要为久坐设置提醒时长。
+     * @param cmd
+     * @param connection
+     * @param runtime
+     */
+    public void handleBPTU(String cmd,Connection connection,Runtime runtime){
+        //IWBPS4,353456789012345,080835,1|1234567|0900|1100|180, 2|1234567|0900|1100|180, 1|1234567|0900|1100|180#
+        //说明：
+//        IW：标识符
+//        BPS4: 命令字符
+//        353456789012345：设备IMEI或者ID
+//        080835 :指令流水号
+//        1|1234567|0900|1100|180:类型(1久坐,2喝水)|重复周期|开始时间|结束时间|时间间隔(单位秒)
+//        重复周期、开始结束时间格式 参考BP85闹钟设置，
+//#:结尾标识符
+        String[] list=cmd.split(CMDSPLIT);
+        if (list.length>=4){
+
+            String index=list[2];
+            String imei=list[1];
+            connection.send(genStringMessage("APS4",APS4(index)));
+
+            String setting1;
+            switch(list.length){
+                case 10:
+                    setting1=list[9];
+                    ICLogger.i("set 7th alarm "+setting1);
+                case 9:
+                    setting1=list[8];
+                    ICLogger.i("set 6th alarm "+setting1);
+                case 8:
+                    setting1=list[7];
+                    ICLogger.i("set 5th alarm "+setting1);
+                case 7:
+                    setting1=list[6];
+                    ICLogger.i("set 4th alarm "+setting1);
+                case 6:
+                    setting1=list[5];
+                    ICLogger.i("set 3rd alarm "+setting1);
+                case 5:
+                    setting1=list[4];
+                    ICLogger.i("set 2nt alarm "+setting1);
+                case 4:
+                    setting1=list[3];
+                    ICLogger.i("set 1st alarm "+setting1);
+                    break;
+            }
+
+            ICLogger.i("Handle BPX1 IMEI "+imei+",index "+index+", get "+(list.length-3) +" settings");
+        }else{
+            ICLogger.i("BPX1 format error!");
+        }
+    }
+
+
+
+
     public boolean handleCmd(CMD_TYPE type, String cmd) {
 
         //普通非二进制命令用此函数处理
@@ -1973,12 +2094,12 @@ public class protocol_ic {
             case BP89:
                 //心率/血压阀值
                 handleBP89(cmd,mConnection);
-                mConnection.DeliverCMDMessageToSystem("AP89",cmd);//通知下面线程状态变化
+                mConnection.DeliverCMDMessageToSystem("IWAP89",cmd);//通知下面线程状态变化
                 break;
 
             case BPTE: //设置测试体温
                 handleBPTE(cmd,mConnection,mRuntime);
-                mConnection.DeliverCMDMessageToSystem("APTE",cmd);//通知下面线程状态变化
+                mConnection.DeliverCMDMessageToSystem("IWAPTE",cmd);//通知下面线程状态变化
                 break;
 
             case BPTP:
@@ -1992,13 +2113,30 @@ public class protocol_ic {
             case BPX1://设置 心率血压血氧修正值
                 handleBPX1(cmd,mConnection,mRuntime);
                 ICLogger.i("收到服务器设置 心率血压血氧修正值BPX1");
-                mConnection.DeliverCMDMessageToSystem("APX1",cmd);//通知下面线程状态变化
+                mConnection.DeliverCMDMessageToSystem("IWAPX1",cmd);//通知下面线程状态变化
                 break;
 
             case BPS4: //提醒设置(时间段) 主要为久坐设置提醒时长。
                 handleBPS4(cmd,mConnection,mRuntime);
                 ICLogger.i("收到 提醒设置(时间段)");
-                mConnection.DeliverCMDMessageToSystem("APS4",cmd);//通知下面线程状态变化
+                mConnection.DeliverCMDMessageToSystem("IWAPS4",cmd);//通知下面线程状态变化
+                break;
+
+            case BPTU:
+                handleBPTU(cmd,mConnection,mRuntime);
+                ICLogger.i("服务器 收到 语音图片信息！");
+                mConnection.DeliverCMDMessageToSystem("IWAPTU",cmd);//通知下面线程状态变化
+                break;
+            case BPDE:
+                handleBPDE();
+                ICLogger.i(" 收到 进出围栏通知！");
+                mConnection.DeliverCMDMessageToSystem("IWAPDE",cmd);//通知下面线程状态变化
+                break;
+
+            case BPDF:
+                handleBPDF();
+                ICLogger.i(" 收到 体温阈值设置！");
+                mConnection.DeliverCMDMessageToSystem("IWAPDF",cmd);//通知下面线程状态变化
                 break;
         }
 
diff --git a/app/version_code.properties b/app/version_code.properties
index 4ded883b..fbbf49e1 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Mon Jul 20 20:05:15 CST 2020
-VERSION_CODE=458
+#Thu Jul 23 16:43:39 CST 2020
+VERSION_CODE=460