Safemobile/safedispatch-mobile
20
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge with develop

Browse Source
This commit is contained in:
CiufudeanDani
2022-03-22 15:18:25 +02:00
parent bac12825c9 456c27b829
commit 6a235d1d3f
10 changed files with 1600 additions and 1956 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libSafeMobile/src/main/java/com/safemobile/activities/AbstractSDParentActivity.java
View File

@ -155,12 +155,12 @@ public abstract class AbstractSDParentActivity extends TabActivity {
}
public boolean sendAlarmAcknowledge(int alarm_id, int type)
public boolean sendAlarmAcknowledge(int alarm_id, int type, String unitName)
{
if(tcp == null)
return false;
boolean res = tcp.Write("0.0", "#28#" + alarm_id + "#" + type + "#");
boolean res = tcp.Write("0.0", "#28#" + alarm_id + "#" + type + "#" + AppParams.USERID + "#" + unitName + "#");
if(res)
SM.Debug("Message [sendAlarmAcknowledge] sent to app server alarm_id:" + alarm_id + " type:" + type);
else