Commit b15115565ceaeada7c700099e06b37f1ba5ebadd
1 parent
9cd9ebd0
更新配置
Showing
2 changed files
with
10 additions
and
7 deletions
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java
| ... | ... | @@ -144,9 +144,8 @@ public class MessageRequestProcessor extends SIPRequestAbstractProcessor { |
| 144 | 144 | private void processMessageCatalogList(RequestEvent evt) { |
| 145 | 145 | try { |
| 146 | 146 | Element rootElement = getRootElement(evt); |
| 147 | - String s = rootElement.toString(); | |
| 148 | 147 | Element deviceIdElement = rootElement.element("DeviceID"); |
| 149 | - String deviceId = deviceIdElement.getText().toString(); | |
| 148 | + String deviceId = deviceIdElement.getText(); | |
| 150 | 149 | Element deviceListElement = rootElement.element("DeviceList"); |
| 151 | 150 | if (deviceListElement == null) { |
| 152 | 151 | return; |
| ... | ... | @@ -164,9 +163,9 @@ public class MessageRequestProcessor extends SIPRequestAbstractProcessor { |
| 164 | 163 | if (channelDeviceElement == null) { |
| 165 | 164 | continue; |
| 166 | 165 | } |
| 167 | - String channelDeviceId = channelDeviceElement.getText().toString(); | |
| 166 | + String channelDeviceId = channelDeviceElement.getText(); | |
| 168 | 167 | Element channdelNameElement = itemDevice.element("Name"); |
| 169 | - String channelName = channdelNameElement != null ? channdelNameElement.getText().toString() : ""; | |
| 168 | + String channelName = channdelNameElement != null ? channdelNameElement.getTextTrim().toString() : ""; | |
| 170 | 169 | Element statusElement = itemDevice.element("Status"); |
| 171 | 170 | String status = statusElement != null ? statusElement.getText().toString() : "ON"; |
| 172 | 171 | DeviceChannel deviceChannel = new DeviceChannel(); |
| ... | ... | @@ -213,7 +212,11 @@ public class MessageRequestProcessor extends SIPRequestAbstractProcessor { |
| 213 | 212 | deferredResultHolder.invokeResult(msg); |
| 214 | 213 | |
| 215 | 214 | // 回复200 |
| 216 | - responseAck(evt); | |
| 215 | + if (offLineDetector.isOnline(deviceId)) { | |
| 216 | + responseAck(evt); | |
| 217 | + publisher.onlineEventPublish(deviceId, VideoManagerConstants.EVENT_ONLINE_KEEPLIVE); | |
| 218 | + } | |
| 219 | + | |
| 217 | 220 | } |
| 218 | 221 | } catch (DocumentException | SipException | InvalidArgumentException | ParseException e) { |
| 219 | 222 | e.printStackTrace(); |
| ... | ... | @@ -359,7 +362,7 @@ public class MessageRequestProcessor extends SIPRequestAbstractProcessor { |
| 359 | 362 | private Element getRootElement(RequestEvent evt) throws DocumentException { |
| 360 | 363 | Request request = evt.getRequest(); |
| 361 | 364 | SAXReader reader = new SAXReader(); |
| 362 | - reader.setEncoding("gbk"); | |
| 365 | +// reader.setEncoding("GB2312"); | |
| 363 | 366 | Document xml = reader.read(new ByteArrayInputStream(request.getRawContent())); |
| 364 | 367 | return xml.getRootElement(); |
| 365 | 368 | } | ... | ... |