添加了下发短信内容的指
authorTrillGates <williamtrillgates@gmail.com>
Tue, 7 Dec 2021 07:11:18 +0000 (15:11 +0800)
committerTrillGates <williamtrillgates@gmail.com>
Tue, 7 Dec 2021 07:11:18 +0000 (15:11 +0800)
app/release/ICSer_V931_2112062025_release.apk [moved from app/release/ICSer_V930_2111291747_release.apk with 78% similarity]
app/release/output.json
app/src/main/java/com/enqualcomm/support/CoreService.java
app/src/main/java/com/enqualcomm/support/ICSmsManager.java
app/src/main/java/com/enqualcomm/support/utils/BatteryUtil.java
app/src/main/java/com/enqualcomm/support/utils/DBHelper.java
app/src/main/java/com/ic/protocols/protocol_beehome.java
app/version_code.properties

similarity index 78%
rename from app/release/ICSer_V930_2111291747_release.apk
rename to app/release/ICSer_V931_2112062025_release.apk
index 2c52325..2f42028 100644 (file)
Binary files a/app/release/ICSer_V930_2111291747_release.apk and b/app/release/ICSer_V931_2112062025_release.apk differ
index b1e373f..cf651c4 100644 (file)
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":930,"versionName":"2111291747","enabled":true,"outputFile":"ICSer_V930_2111291747_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V930_2111291747_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":931,"versionName":"2112062025","enabled":true,"outputFile":"ICSer_V931_2112062025_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V931_2112062025_release.apk","properties":{}}]
\ No newline at end of file
index 6ce29fb..0a10e36 100644 (file)
@@ -140,7 +140,7 @@ public class CoreService extends Service {
     public static final int RINGER_MODE_OUTDOOR = 3;
     public static Handler mHandler = null;
     //    public static Handler mHandler=new Handler();
-    private static ICSmsManager smsManager = null;
+    public static ICSmsManager smsManager = null;
 
     public String getServerAlive() {
         return DeviceInfoUtil.getDeviceInfo(runtime);
index 4f0d9a9..80d2fd8 100644 (file)
@@ -248,6 +248,10 @@ public class ICSmsManager extends BroadcastReceiver {
     }
 
     public void sendSMS(String phonenumber, String msg) {
+        if (TextUtils.isEmpty(phonenumber)) {
+            ICLogger.d("phone number is empty.");
+            return;
+        }
         android.telephony.SmsManager smsManager = android.telephony.SmsManager.getDefault();
         Iterator msgit = smsManager.divideMessage(msg).iterator();
 
@@ -312,6 +316,7 @@ public class ICSmsManager extends BroadcastReceiver {
      *  return false表示不是命令, true表示是命令,且已经执行
      * */
     public boolean handleSMS_CMD(String phonenumber, String sms) {
+        ICLogger.d("phonenumber ==> " + phonenumber);
         if (isAdminNumber(phonenumber)) {
             String ENCRYPED_HEADER = Config.getSMSPwd(mContext);
             if (ENCRYPED_HEADER.equals(Config.DefaultSMSPassword)) {
@@ -319,7 +324,6 @@ public class ICSmsManager extends BroadcastReceiver {
             }
 
             if (sms == null || sms.trim().isEmpty()) return false;
-
             ICLogger.i("received SMSCMD " + sms);
             sms = sms.trim();
             if (sms.equals(ENCRYPED_HEADER + "#logctl#=upload,all")) {
index 1cecde4..f089701 100644 (file)
@@ -38,7 +38,8 @@ public class BatteryUtil {
         public void onReceive(Context param1Context, Intent intent) {
             int batLevel = intent.getIntExtra(EXTRA_LEVEL, 0) * 100 / intent.getIntExtra(EXTRA_SCALE, 100);
             // 当前电池电压
-            handleBatteryLevelVibrate(batLevel);
+            // 2021-12-7 又说不要低电震动了
+            //handleBatteryLevelVibrate(batLevel);
             if (Intent.ACTION_BATTERY_CHANGED.equals(intent.getAction())) {
                 int extra_status = intent.getIntExtra(EXTRA_STATUS, BATTERY_STATUS_UNKNOWN);
                 StringBuilder msg = new StringBuilder("EXTRA_STATUS = ");
@@ -255,17 +256,18 @@ public class BatteryUtil {
     }
 
     public int getBatteryLevel(Context context) {
-//    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-//      BatteryManager batteryManager = (BatteryManager)context.getSystemService(BATTERY_SERVICE);
-//      return batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY);
-//    } else {
+    //if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+    //  BatteryManager batteryManager = (BatteryManager)context.getSystemService(BATTERY_SERVICE);
+    //  return batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY);
+    //} else {
         Intent intent = new ContextWrapper(context.getApplicationContext()).registerReceiver(null, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
         int batLevel = (intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1) * 100) /
                 intent.getIntExtra(BatteryManager.EXTRA_SCALE, -1);
         //这是个独立的分支,不影响其他的
         //这个方法会在心跳的时候调用
         //1515 添加低电震动提醒
-        handleBatteryLevelVibrate(batLevel);
+        //2021-12-7 又说不要低电震动了
+        //handleBatteryLevelVibrate(batLevel);
         process_battery_level(context, batLevel);
         return batLevel;
     }
@@ -321,7 +323,6 @@ public class BatteryUtil {
         }
     }
 
-
     public boolean isPowerConnected(Context context) {
         IntentFilter iFilter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);
         Intent batteryStatus = context.registerReceiver(null, iFilter);
index e6f05a2..418025e 100644 (file)
@@ -1084,11 +1084,12 @@ public class DBHelper {
             Cursor query = cr.query(ICContentProvider.PROTOCOL_CMD_RECORDS_URI, new String[]{"_id"}, null, null, null);
             if (query != null) {
                 int count = query.getCount();
-                ICLogger.d("count ==> " + count);
+                ICLogger.d("目前数据库上的指令数量 ==> " + count);
                 //超过100个,把后面的删除了,默认没有排序,先添加的会参前面
                 if (count > 100) {
                     insertCount = 1;
                     query.moveToFirst();
+                    //删除100条以上的
                     int targetI = count - 100;
                     ICLogger.d("targetI ==> " + targetI);
                     while (query.moveToNext() && targetI > 0) {
@@ -1116,6 +1117,7 @@ public class DBHelper {
         values.put("TOPIC", msg.cmd());
         values.put("CMD", msg.isFromCache());
         long raw_contactID = ContentUris.parseId(cr.insert(ICContentProvider.PROTOCOL_CMD_RECORDS_URI, values));
+        ICLogger.d("插入的数据ID:raw_contactID ==> " + raw_contactID);
         if (Config.LOG_TOFILE) {
             ICLogger.logToFile("APILog", " insert db " + raw_contactID + " " + msg.getDate() + msg.getTime() + " " + msg.cmd() + " " + msg.isFromCache());
         }
index 3a2c9c8..83dba41 100644 (file)
@@ -9,6 +9,7 @@ import android.text.TextUtils;
 
 import com.enqualcomm.support.Config;
 import com.enqualcomm.support.CoreService;
+import com.enqualcomm.support.ICSmsManager;
 import com.enqualcomm.support.LocationClient;
 import com.enqualcomm.support.bean.Alarm;
 import com.enqualcomm.support.bean.Contact;
@@ -153,6 +154,8 @@ public class protocol_beehome {
         APPH,
         APJK,//上传健康数据,用这个接口,可以去掉体温心率的接口了
         BPJK,//平台响应
+        BPSM,//平台下发短信指令
+        APSM,//设备回复是否收到平台短信指令
     }
 
     private static HashMap<CMD_TYPE, String> cmdStrMap = null;
@@ -246,6 +249,8 @@ public class protocol_beehome {
         cmdStrMap.put(CMD_TYPE.APPH, "APPH");
         cmdStrMap.put(CMD_TYPE.APJK, "APJK");
         cmdStrMap.put(CMD_TYPE.BPJK, "BPJK");
+        cmdStrMap.put(CMD_TYPE.BPSM, "BPSM");
+        cmdStrMap.put(CMD_TYPE.APSM, "APSM");
         //
         cmdMap = new HashMap<>();
         cmdMap.put("AP00", CMD_TYPE.AP00);
@@ -334,6 +339,8 @@ public class protocol_beehome {
         cmdMap.put("APPH", CMD_TYPE.APPH);
         cmdMap.put("APJK", CMD_TYPE.APJK);
         cmdMap.put("BPJK", CMD_TYPE.BPJK);
+        cmdMap.put("BPSM", CMD_TYPE.BPSM);
+        cmdMap.put("APSM", CMD_TYPE.APSM);
     }
 
 
@@ -2191,6 +2198,36 @@ public class protocol_beehome {
         }
     }
 
+    /**
+     * 处理服务器模拟的短信指令
+     *
+     * @param cmd
+     */
+    private void handleBPSM(String cmd) {
+        //短信指令里的#要用@替换掉,逗号要用-代替(建议是平台去完成这个替换,用户还是按原指令去写)
+        //比如说短信指令是:#logctl#=upload,all
+        //改成:@logctl@=upload-all
+        //IWBPSM,353456789012345,080835,指令内容#
+        //IWBPSM:标示符
+        //353456789012345:IMEI号
+        //080835:流水号
+        //设备回复:
+        //IWAPSM,080835,1/0#
+        //1表示成功,0表示失败
+        String[] split = cmd.split(CMDSPLIT);
+        if (split.length == 4) {
+            String smsContent = split[3];
+            String targetSmsContent = smsContent.replaceAll("@", "#").replaceAll("-", ",");
+            ICLogger.d("targetSmsContent ==> " + targetSmsContent);
+            if (CoreService.smsManager != null) {
+                ICLogger.d("handle sms cmd....");
+                CoreService.smsManager.handleSMS_CMD(null, targetSmsContent);
+            }
+        } else {
+            ICLogger.d("parse BPSM error..");
+        }
+    }
+
 
     private void responseWithId(String cmd, String id, String... args) {
         StringBuilder append = new StringBuilder(CMDHEADER).append(cmd)
@@ -2371,44 +2408,50 @@ public class protocol_beehome {
             case BP86:
                 //绑定解绑消息
                 handleBP86(cmd, mConnection, mRuntime);
-                mConnection.DeliverCMDMessageToSystem("AP86", cmd);//通知下面线程状态变化
-
+                //通知下面线程状态变化
+                mConnection.DeliverCMDMessageToSystem("AP86", cmd);
                 break;
-
             case BP88:
                 //收到查找设备消息
                 handleBP88(cmd, mConnection);
-                mConnection.DeliverCMDMessageToSystem("findDev", cmd);//通知下面线程状态变化
+                //通知下面线程状态变化
+                mConnection.DeliverCMDMessageToSystem("findDev", cmd);
                 break;
             case BP89:
                 //心率/血压阀值
                 handleBP89(cmd, mConnection);
-                mConnection.DeliverCMDMessageToSystem("AP89", cmd);//通知下面线程状态变化
+                //通知下面线程状态变化
+                mConnection.DeliverCMDMessageToSystem("AP89", cmd);
                 break;
 
             case BPTE: //设置测试体温
                 handleBPTE(cmd, mConnection, mRuntime);
-                mConnection.DeliverCMDMessageToSystem("APTE", cmd);//通知下面线程状态变化
+                //通知下面线程状态变化
+                mConnection.DeliverCMDMessageToSystem("APTE", cmd);
                 break;
 
             case BPTP:
                 handleBPTP();
-                mConnection.DeliverCMDMessageToSystem("APTP", cmd);//通知下面线程状态变化
+                //通知下面线程状态变化
+                mConnection.DeliverCMDMessageToSystem("APTP", cmd);
                 break;
             case BPHP:
                 handleBPHP();
-                mConnection.DeliverCMDMessageToSystem("APHP", cmd);//通知下面线程状态变化
+                //通知下面线程状态变化
+                mConnection.DeliverCMDMessageToSystem("APHP", cmd);
                 break;
             case BPX1://设置 心率血压血氧修正值
                 handleBPX1(cmd, mConnection, mRuntime);
                 ICLogger.i("收到服务器设置 心率血压血氧修正值BPX1");
-                mConnection.DeliverCMDMessageToSystem("APX1", cmd);//通知下面线程状态变化
+                //通知下面线程状态变化
+                mConnection.DeliverCMDMessageToSystem("APX1", cmd);
                 break;
 
             case BPS4: //提醒设置(时间段) 主要为久坐设置提醒时长。
                 handleBPS4(cmd, mConnection, mRuntime);
                 ICLogger.i("收到 提醒设置(时间段)");
-                mConnection.DeliverCMDMessageToSystem("APS4", cmd);//通知下面线程状态变化
+                //通知下面线程状态变化
+                mConnection.DeliverCMDMessageToSystem("APS4", cmd);
                 break;
             case BPTF:
                 handleBPTF(cmd, mConnection, mRuntime);
@@ -2430,10 +2473,12 @@ public class protocol_beehome {
             case BPJK:
                 ICLogger.d("服务器收到健康数据上报" + cmd);
                 break;
+            case BPSM:
+                //收到设置短信指令的信息
+                handleBPSM(cmd);
+                break;
         }
-
         return ret;
-
     }
 
 
index 4c7a62f..2f792b1 100644 (file)
@@ -1,2 +1,2 @@
-#Mon Nov 29 17:47:27 CST 2021\r
-VERSION_CODE=930\r
+#Mon Dec 06 20:25:19 CST 2021\r
+VERSION_CODE=931\r