From: TrillGates Date: Fri, 17 Dec 2021 02:49:36 +0000 (+0800) Subject: 短信添加了回复 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=a323b928ba54a000e68481a7e37483ee9699adc0;p=icsupport.git 短信添加了回复 --- diff --git a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java index d89be8a2..ea3e8aa1 100644 --- a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java +++ b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java @@ -123,10 +123,8 @@ public class ICSmsManager extends BroadcastReceiver { String forceReadMsg = Util.getSystemProperties("persist.sys.forcereadmsg"); ICLogger.d("forceReadMsg == > " + forceReadMsg); if (handleSMS_CMD(from, message) == false) { - //说明不是sms命令,提示短信接收。 if (!TextUtils.isEmpty(forceReadMsg)) { - WakeLockUtil.ScreenOnWakeLockTemperary(context); ContextProxy.play_waning_notify(context); VibrateUtil.getInstance(context).VibrateOnOnce(true); @@ -247,19 +245,29 @@ public class ICSmsManager extends BroadcastReceiver { } - public void sendSMS(String phonenumber, String msg) { - if (TextUtils.isEmpty(phonenumber)) { + public void sendSMS(String phoneNumber, String msg) { + if (TextUtils.isEmpty(phoneNumber)) { ICLogger.d("phone number is empty."); return; } + if (phoneNumber.startsWith("WEB")) { + ICLogger.d("send msg to web..."); + //拿到流水号 + String[] split = phoneNumber.split("-"); + if (split.length == 2) { + String cmdIndex = split[1]; + protocolAPIHelper.sendMsg2Web(cmdIndex, msg); + } + return; + } android.telephony.SmsManager smsManager = android.telephony.SmsManager.getDefault(); Iterator msgit = smsManager.divideMessage(msg).iterator(); while (msgit.hasNext()) { String message = (String) msgit.next(); - ICLogger.i("reply message to " + phonenumber + ", " + message); - if (phonenumber != null && !phonenumber.isEmpty()) { - smsManager.sendTextMessage(phonenumber, (String) null, message, (PendingIntent) null, (PendingIntent) null); + ICLogger.i("reply message to " + phoneNumber + ", " + message); + if (phoneNumber != null && !phoneNumber.isEmpty()) { + smsManager.sendTextMessage(phoneNumber, (String) null, message, (PendingIntent) null, (PendingIntent) null); } } } 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 f7364d80..7c74ba94 100644 --- a/app/src/main/java/com/enqualcomm/support/service/Deliver.java +++ b/app/src/main/java/com/enqualcomm/support/service/Deliver.java @@ -717,12 +717,10 @@ public class Deliver extends AbstractConnectionService { } } } - // if (wifiEnabled && "false".equals(isUserOpen)) { // //原来wifi没开,且不打算开启wifi则关闭wifi // wifiManager.setWifiEnabled(false); // } - } } diff --git a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java index b3abb87e..44e74410 100644 --- a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java +++ b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java @@ -140,6 +140,32 @@ public class protocolAPIHelper { return ret; } + public static boolean sendMsg2Web(String cmdIndex, String msg) { + //只要服务器收到消息,就认为服务器是联通的,保存联通的时间 + Runtime.lastLinkReceiveStamp = System.currentTimeMillis(); + if (is_protocol_not_Initialled()) return false; + switch (Config.protocol_no) { + case Config.PROTOCOL_JIAI: + break; + case Config.PROTOCOL_BEEHOME: + protocolbeehome_handler.sendMsg2Web(cmdIndex, msg); + break; + case Config.PROTOCOL_IC: + break; + case Config.PROTOCOL_FZD: + break; + case Config.PROTOCOL_MQTT: + break; + case PROTOCOL_ANAN: + break; + case Config.PROTOCOL_S123: + break; + case Config.PROTOCOL_GATOR: + break; + } + return true; + } + /* 返回true 表示 cmd 全部解析成功 返回false表示 cmd至少有一条解析失败,失败的数据归入buffer,下一次识别接着使用 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 840b2f84..228670e9 100644 --- a/app/src/main/java/com/ic/protocols/protocol_beehome.java +++ b/app/src/main/java/com/ic/protocols/protocol_beehome.java @@ -82,6 +82,18 @@ public class protocol_beehome { handleCmd(cmd_type, cmd); } + public void sendMsg2Web(String cmdIndex, String msg) { + //返回的消息在短信处理之后进行返回 + mConnection.send(genStringMessage(cmdStrMap.get(CMD_TYPE.APSM), + new StringBuffer(CMDHEADER) + .append(cmdStrMap.get(CMD_TYPE.APSM)) + .append(CMDSPLIT) + .append(cmdIndex) + .append(CMDSPLIT) + .append(msg) + .toString())); + } + public enum CMD_TYPE { /*终端发起*/ AP00,//登录包 @@ -2498,16 +2510,9 @@ public class protocol_beehome { ICLogger.d("targetSmsContent ==> " + targetSmsContent); if (CoreService.smsManager != null) { ICLogger.d("handle sms cmd...."); - CoreService.smsManager.handleSMS_CMD(null, targetSmsContent); + //"WEB-"就是靠这个标记给后台发送东西的了 + CoreService.smsManager.handleSMS_CMD("WEB-" + indexId, targetSmsContent); } - mConnection.send(genStringMessage(cmdStrMap.get(CMD_TYPE.APSM), - new StringBuffer(CMDHEADER) - .append(cmdStrMap.get(CMD_TYPE.APSM)) - .append(CMDSPLIT) - .append(indexId) - .append(CMDSPLIT) - .append("1")//收到就说成功了,不等处理,处理有些指令是阻塞的/是异步的 - .toString())); } else { ICLogger.d("parse BPSM error.."); }