Merge pull request 'when receiving a new alarm && current tab is alarms, refresh alarm list' (#22) from SD-224 into develop
Reviewed-on: #22
This commit is contained in:
commit
539170109d
@ -255,13 +255,12 @@ public abstract class AbstractSDParentActivity extends TabActivity {
|
|||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean getAlarms(long userID)
|
public boolean getAlarms(long userID) {
|
||||||
{
|
if (tcp == null)
|
||||||
if(tcp == null)
|
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
boolean res = tcp.Write("0.0", "#27#" + userID + "#");
|
boolean res = tcp.Write("0.0", "#27#" + userID + "#");
|
||||||
if(res)
|
if (res)
|
||||||
SM.Debug("Message [GetAlarms] sent to app server");
|
SM.Debug("Message [GetAlarms] sent to app server");
|
||||||
else
|
else
|
||||||
SM.Debug("Could not send message [GetAlarms]!!");
|
SM.Debug("Could not send message [GetAlarms]!!");
|
||||||
|
@ -1741,11 +1741,9 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
|
|||||||
}
|
}
|
||||||
|
|
||||||
//list for SMS
|
//list for SMS
|
||||||
if (AppParams.crtTab == AppParams.Tabs.alarms) {
|
if (AppParams.crtTab == AppParams.Tabs.alarms)
|
||||||
SM.Debug("currentActivity instanceof AlarmActivity - newSMS | " + tempArr[0] + " | " + tempArr[1]);
|
|
||||||
getAlarms(AppParams.USERID);
|
getAlarms(AppParams.USERID);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onRecordingsListReceived(TCPEvent event) {
|
public void onRecordingsListReceived(TCPEvent event) {
|
||||||
|
Loading…
Reference in New Issue
Block a user