Compare commits
No commits in common. "dc2cb825bba20ed9e5554b412af157dabf3a385c" and "04fa7a5b2ebe5a7e55dde92e83c75edae6a57b6d" have entirely different histories.
dc2cb825bb
...
04fa7a5b2e
@ -255,7 +255,8 @@ public abstract class AbstractSDParentActivity extends TabActivity {
|
||||
return res;
|
||||
}
|
||||
|
||||
public boolean getAlarms(long userID) {
|
||||
public boolean getAlarms(long userID)
|
||||
{
|
||||
if(tcp == null)
|
||||
return false;
|
||||
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
package com.safemobile.services;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.NoSuchElementException;
|
||||
|
||||
@ -13,12 +14,14 @@ import com.safemobile.lib.TCPmsg;
|
||||
|
||||
public class TCPmsgParser implements Runnable{
|
||||
|
||||
|
||||
public boolean run = true;
|
||||
private TCPmsg _msg;
|
||||
private static final List<ITCPListener> _listeners = new ArrayList<>();
|
||||
private static List<ITCPListener> _listeners = new ArrayList<ITCPListener>();
|
||||
private Thread TCPmsgParserThread;
|
||||
|
||||
public TCPmsgParser() {
|
||||
public TCPmsgParser()
|
||||
{
|
||||
TCPmsgParserThread = new Thread(this, "TCPmsgParserThread");
|
||||
TCPmsgParserThread.start(); // (2) Start the thread.
|
||||
}
|
||||
@ -35,151 +38,177 @@ public class TCPmsgParser implements Runnable {
|
||||
_listeners.clear();
|
||||
}
|
||||
|
||||
public int getListenersSize()
|
||||
{
|
||||
return _listeners.size();
|
||||
}
|
||||
|
||||
private synchronized void _fireLoginEvent() {
|
||||
TCPEvent event = new TCPEvent( this, _msg );
|
||||
for (ITCPListener listener : _listeners) {
|
||||
listener.onLoginReceived(event);
|
||||
Iterator<ITCPListener> listeners = _listeners.iterator();
|
||||
while( listeners.hasNext() ) {
|
||||
( (ITCPListener) listeners.next() ).onLoginReceived( event );
|
||||
}
|
||||
}
|
||||
private synchronized void _fireGPSEvent() {
|
||||
TCPEvent event = new TCPEvent( this, _msg );
|
||||
for (ITCPListener listener : _listeners) {
|
||||
listener.onGPSReceived(event);
|
||||
Iterator<ITCPListener> listeners = _listeners.iterator();
|
||||
while( listeners.hasNext() ) {
|
||||
( (ITCPListener) listeners.next() ).onGPSReceived(event);
|
||||
}
|
||||
}
|
||||
private synchronized void _fireSMSEvent() {
|
||||
TCPEvent event = new TCPEvent( this, _msg );
|
||||
for (ITCPListener listener : _listeners) {
|
||||
listener.onSMSReceived(event);
|
||||
Iterator<ITCPListener> listeners = _listeners.iterator();
|
||||
while( listeners.hasNext() ) {
|
||||
( (ITCPListener) listeners.next() ).onSMSReceived( event );
|
||||
}
|
||||
}
|
||||
|
||||
private synchronized void _fireLastSMSEvent() {
|
||||
TCPEvent event = new TCPEvent( this, _msg );
|
||||
for (ITCPListener listener : _listeners) {
|
||||
listener.onLastSMSsReceived(event);
|
||||
Iterator<ITCPListener> listeners = _listeners.iterator();
|
||||
while( listeners.hasNext() ) {
|
||||
( (ITCPListener) listeners.next() ).onLastSMSsReceived(event);
|
||||
}
|
||||
}
|
||||
|
||||
private synchronized void _fireVehEvent() {
|
||||
TCPEvent event = new TCPEvent( this, _msg );
|
||||
for (ITCPListener listener : _listeners) {
|
||||
listener.onVehiclesReceived(event);
|
||||
Iterator<ITCPListener> listeners = _listeners.iterator();
|
||||
while( listeners.hasNext() ) {
|
||||
( (ITCPListener) listeners.next() ).onVehiclesReceived( event );
|
||||
}
|
||||
}
|
||||
|
||||
private synchronized void _fireNewSMS() {
|
||||
TCPEvent event = new TCPEvent( this, _msg );
|
||||
for (ITCPListener listener : _listeners) {
|
||||
listener.onNewSMSReceived(event);
|
||||
Iterator<ITCPListener> listeners = _listeners.iterator();
|
||||
while( listeners.hasNext() ) {
|
||||
( (ITCPListener) listeners.next() ).onNewSMSReceived(event);
|
||||
}
|
||||
}
|
||||
|
||||
private synchronized void _fireSMSconfirm() {
|
||||
TCPEvent event = new TCPEvent( this, _msg );
|
||||
for (ITCPListener listener : _listeners) {
|
||||
listener.onSMSAckReceived(event);
|
||||
Iterator<ITCPListener> listeners = _listeners.iterator();
|
||||
while( listeners.hasNext() ) {
|
||||
( (ITCPListener) listeners.next() ).onSMSAckReceived(event);
|
||||
}
|
||||
}
|
||||
|
||||
private synchronized void _fireLastPos() {
|
||||
TCPEvent event = new TCPEvent( this, _msg );
|
||||
for (ITCPListener listener : _listeners) {
|
||||
listener.onLastPositionsReceived(event);
|
||||
Iterator<ITCPListener> listeners = _listeners.iterator();
|
||||
while( listeners.hasNext() ) {
|
||||
( (ITCPListener) listeners.next() ).onLastPositionsReceived(event);
|
||||
}
|
||||
}
|
||||
|
||||
private synchronized void _fireRadioEvent() {
|
||||
TCPEvent event = new TCPEvent( this, _msg );
|
||||
for (ITCPListener listener : _listeners) {
|
||||
listener.onRadioMsgReceived(event);
|
||||
Iterator<ITCPListener> listeners = _listeners.iterator();
|
||||
while( listeners.hasNext() ) {
|
||||
( (ITCPListener) listeners.next() ).onRadioMsgReceived(event);
|
||||
}
|
||||
}
|
||||
|
||||
private synchronized void _fireHistPos() {
|
||||
TCPEvent event = new TCPEvent( this, _msg );
|
||||
for (ITCPListener listener : _listeners) {
|
||||
listener.onHistoryPositionsReceived(event);
|
||||
Iterator<ITCPListener> listeners = _listeners.iterator();
|
||||
while( listeners.hasNext() ) {
|
||||
( (ITCPListener) listeners.next() ).onHistoryPositionsReceived(event);
|
||||
}
|
||||
}
|
||||
|
||||
private synchronized void _fireHistCount() {
|
||||
TCPEvent event = new TCPEvent( this, _msg );
|
||||
for (ITCPListener listener : _listeners) {
|
||||
listener.onHistoryPositionsCountReceived(event);
|
||||
Iterator<ITCPListener> listeners = _listeners.iterator();
|
||||
while( listeners.hasNext() ) {
|
||||
( (ITCPListener) listeners.next() ).onHistoryPositionsCountReceived(event);
|
||||
}
|
||||
}
|
||||
|
||||
private synchronized void _fireAlarmList() {
|
||||
TCPEvent event = new TCPEvent( this, _msg );
|
||||
for (ITCPListener listener : _listeners) {
|
||||
listener.onAlarmsReceived(event);
|
||||
Iterator<ITCPListener> listeners = _listeners.iterator();
|
||||
while( listeners.hasNext() ) {
|
||||
( (ITCPListener) listeners.next() ).onAlarmsReceived(event);
|
||||
}
|
||||
}
|
||||
|
||||
private synchronized void _fireAlarmACK() {
|
||||
TCPEvent event = new TCPEvent( this, _msg );
|
||||
for (ITCPListener listener : _listeners) {
|
||||
listener.onAlarmAckReceived(event);
|
||||
Iterator<ITCPListener> listeners = _listeners.iterator();
|
||||
while( listeners.hasNext() ) {
|
||||
( (ITCPListener) listeners.next() ).onAlarmAckReceived(event);
|
||||
}
|
||||
}
|
||||
|
||||
private synchronized void _fireAlarmLive() {
|
||||
TCPEvent event = new TCPEvent( this, _msg );
|
||||
for (ITCPListener listener : _listeners) {
|
||||
listener.alarmLiveReceived(event);
|
||||
Iterator<ITCPListener> listeners = _listeners.iterator();
|
||||
while( listeners.hasNext() ) {
|
||||
( (ITCPListener) listeners.next() ).alarmLiveReceived(event);
|
||||
}
|
||||
}
|
||||
|
||||
private synchronized void _fireRecordList() {
|
||||
TCPEvent event = new TCPEvent( this, _msg );
|
||||
for (ITCPListener listener : _listeners) {
|
||||
listener.onRecordingsListReceived(event);
|
||||
Iterator<ITCPListener> listeners = _listeners.iterator();
|
||||
while( listeners.hasNext() ) {
|
||||
( (ITCPListener) listeners.next()).onRecordingsListReceived(event);
|
||||
}
|
||||
}
|
||||
|
||||
private synchronized void _fireRecordPlay() {
|
||||
TCPEvent event = new TCPEvent( this, _msg );
|
||||
for (ITCPListener listener : _listeners) {
|
||||
listener.onRecordingPlayReceived(event);
|
||||
Iterator<ITCPListener> listeners = _listeners.iterator();
|
||||
while( listeners.hasNext() ) {
|
||||
( (ITCPListener) listeners.next()).onRecordingPlayReceived(event);
|
||||
}
|
||||
}
|
||||
|
||||
private synchronized void _firePOLLEvent() {
|
||||
TCPEvent event = new TCPEvent( this, _msg );
|
||||
for (ITCPListener listener : _listeners) {
|
||||
listener.onPollReceived(event);
|
||||
Iterator<ITCPListener> listeners = _listeners.iterator();
|
||||
while( listeners.hasNext() ) {
|
||||
( (ITCPListener) listeners.next()).onPollReceived(event);
|
||||
}
|
||||
}
|
||||
|
||||
private synchronized void _fireConnectionReplyEvent() {
|
||||
TCPEvent event = new TCPEvent( this, _msg );
|
||||
for (ITCPListener listener : _listeners) {
|
||||
listener.onConnectionReplyReceived(event);
|
||||
Iterator<ITCPListener> listeners = _listeners.iterator();
|
||||
while( listeners.hasNext() ) {
|
||||
( (ITCPListener) listeners.next()).onConnectionReplyReceived(event);
|
||||
}
|
||||
}
|
||||
|
||||
private synchronized void _fireContactsReceivedEvent() {
|
||||
TCPEvent event = new TCPEvent( this, _msg );
|
||||
|
||||
for (ITCPListener listener : _listeners) {
|
||||
listener.onContactsListReceived(event);
|
||||
Iterator<ITCPListener> listeners = _listeners.iterator();
|
||||
while( listeners.hasNext() ) {
|
||||
( (ITCPListener) listeners.next()).onContactsListReceived(event);
|
||||
}
|
||||
}
|
||||
|
||||
private synchronized void _fireRecordingsReceivedEvent() {
|
||||
TCPEvent event = new TCPEvent( this, _msg );
|
||||
|
||||
for (ITCPListener listener : _listeners) {
|
||||
listener.onRecordingsListReceived(event);
|
||||
Iterator<ITCPListener> listeners = _listeners.iterator();
|
||||
while( listeners.hasNext() ) {
|
||||
( (ITCPListener) listeners.next()).onRecordingsListReceived(event);
|
||||
}
|
||||
}
|
||||
|
||||
private synchronized void _fireTextMessagesReceivedEvent() {
|
||||
TCPEvent event = new TCPEvent( this, _msg );
|
||||
|
||||
for (ITCPListener listener : _listeners) {
|
||||
listener.onTextMessagesListReceived(event);
|
||||
Iterator<ITCPListener> listeners = _listeners.iterator();
|
||||
while( listeners.hasNext() ) {
|
||||
( (ITCPListener) listeners.next()).onTextMessagesListReceived(event);
|
||||
}
|
||||
}
|
||||
|
||||
@ -187,56 +216,64 @@ public class TCPmsgParser implements Runnable {
|
||||
private synchronized void _fireRecordingPlayReceivedEvent() {
|
||||
TCPEvent event = new TCPEvent( this, _msg );
|
||||
|
||||
for (ITCPListener listener : _listeners) {
|
||||
listener.onRecordingPlayReceived(event);
|
||||
Iterator<ITCPListener> listeners = _listeners.iterator();
|
||||
while( listeners.hasNext() ) {
|
||||
( (ITCPListener) listeners.next()).onRecordingPlayReceived(event);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public static synchronized void _fireTCPConnectionDownEvent(boolean previuosWasConnectionUp) {
|
||||
for (ITCPListener listener : _listeners) {
|
||||
listener.onTCPConnectionDown(previuosWasConnectionUp);
|
||||
Iterator<ITCPListener> listeners = _listeners.iterator();
|
||||
while( listeners.hasNext() ) {
|
||||
( (ITCPListener) listeners.next()).onTCPConnectionDown(previuosWasConnectionUp);
|
||||
}
|
||||
}
|
||||
|
||||
public static synchronized void _fireTCPConnectionUpEvent(boolean previuosWasConnectionUp) {
|
||||
for (ITCPListener listener : _listeners) {
|
||||
listener.onTCPConnectionUp(previuosWasConnectionUp);
|
||||
Iterator<ITCPListener> listeners = _listeners.iterator();
|
||||
while( listeners.hasNext() ) {
|
||||
( (ITCPListener) listeners.next()).onTCPConnectionUp(previuosWasConnectionUp);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public static synchronized void _fireonTCPConnectionStatusEvent(boolean isConnectionUp, boolean previuosWasConnectionUp) {
|
||||
for (ITCPListener listener : _listeners) {
|
||||
listener.onTCPConnectionStatusReceived(isConnectionUp, previuosWasConnectionUp);
|
||||
Iterator<ITCPListener> listeners = _listeners.iterator();
|
||||
while( listeners.hasNext() ) {
|
||||
( (ITCPListener) listeners.next()).onTCPConnectionStatusReceived(isConnectionUp, previuosWasConnectionUp);
|
||||
}
|
||||
}
|
||||
|
||||
public static synchronized void _firePONGReceivedEvent() {
|
||||
for (ITCPListener listener : _listeners) {
|
||||
listener.onPONGReceived();
|
||||
Iterator<ITCPListener> listeners = _listeners.iterator();
|
||||
while( listeners.hasNext() ) {
|
||||
( (ITCPListener) listeners.next()).onPONGReceived();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
while(run) {
|
||||
public void run()
|
||||
{
|
||||
while(run)
|
||||
{
|
||||
//SM.Debug("TCPmsgParser waiting for data...");
|
||||
sleep(1);
|
||||
|
||||
if(TCPhandler.msgList==null)
|
||||
continue;
|
||||
if(!TCPhandler.msgList.isEmpty()) {
|
||||
|
||||
try {
|
||||
if(!TCPhandler.msgList.isEmpty())
|
||||
{
|
||||
try
|
||||
{
|
||||
_msg = TCPhandler.msgList.poll();
|
||||
if(_msg == null)
|
||||
continue;
|
||||
if(!_msg.OK)
|
||||
if(_msg.OK == false)
|
||||
continue;
|
||||
//parse the rest of the message;
|
||||
|
||||
|
||||
switch(_msg.opCode)
|
||||
{
|
||||
case 40: /* login */{
|
||||
@ -249,20 +286,21 @@ public class TCPmsgParser implements Runnable {
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
case 42: /* Text Message */{
|
||||
_fireSMSEvent();
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
case 43: /* Last text message */ {
|
||||
_fireLastSMSEvent();
|
||||
break;
|
||||
}
|
||||
|
||||
case OperationCodes.TM_ACK:{
|
||||
_fireSMSconfirm();
|
||||
break;
|
||||
}
|
||||
|
||||
case OperationCodes.TM_ACK:
|
||||
case OperationCodes.TM_ACK_SD:{
|
||||
_fireSMSconfirm();
|
||||
break;
|
||||
@ -288,7 +326,6 @@ public class TCPmsgParser implements Runnable {
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
case 50: /* radio */ {
|
||||
_fireRadioEvent();
|
||||
break;
|
||||
@ -304,13 +341,11 @@ public class TCPmsgParser implements Runnable {
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
case 47: /* alert list */ {
|
||||
_fireAlarmList();
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
case 48: /* alert ack */ {
|
||||
_fireAlarmACK();
|
||||
break;
|
||||
@ -368,27 +403,37 @@ public class TCPmsgParser implements Runnable {
|
||||
|
||||
default:
|
||||
break;
|
||||
|
||||
}
|
||||
}
|
||||
catch(Exception ex) {
|
||||
catch(Exception ex)
|
||||
{
|
||||
try {
|
||||
if(TCPhandler.msgList.size() > 0)
|
||||
_msg = TCPhandler.msgList.remove(0);
|
||||
} catch(NoSuchElementException exe) {
|
||||
}
|
||||
catch(NoSuchElementException exe)
|
||||
{
|
||||
SM.Exception("TCP msg Parser", "NoSuchElementException");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
/*
|
||||
catch (Exception e)
|
||||
{
|
||||
SM.Debug("Error on fire Event:"+e.toString());
|
||||
break;
|
||||
}
|
||||
|
||||
}*/
|
||||
SM.Debug("TCPmsgParser listen thread stoped.");
|
||||
}
|
||||
|
||||
private void sleep(int miliseconds) {
|
||||
try {
|
||||
Thread.sleep(miliseconds);
|
||||
} catch (InterruptedException ignored) { }
|
||||
} catch (InterruptedException e) {
|
||||
}
|
||||
}
|
||||
|
||||
public void clearMsgList()
|
||||
@ -396,14 +441,17 @@ public class TCPmsgParser implements Runnable {
|
||||
TCPhandler.msgList.clear();
|
||||
}
|
||||
|
||||
public void Stop() {
|
||||
public void Stop()
|
||||
{
|
||||
run = false;
|
||||
// stop thread
|
||||
if(TCPmsgParserThread != null) {
|
||||
if(TCPmsgParserThread != null)
|
||||
{
|
||||
Thread moribund = TCPmsgParserThread;
|
||||
TCPmsgParserThread = null;
|
||||
moribund.interrupt();
|
||||
}
|
||||
SM.Debug("Stoping TCPmsgParser");
|
||||
}
|
||||
|
||||
}
|
||||
@ -78,4 +78,6 @@ dependencies {
|
||||
|
||||
// add Gson
|
||||
implementation 'com.google.code.gson:gson:2.8.6'
|
||||
|
||||
//retrofit
|
||||
}
|
||||
|
||||
@ -42,6 +42,7 @@ public class GoogleMapsInfoBubble implements GoogleMap.InfoWindowAdapter {
|
||||
public GoogleMapsInfoBubble(LayoutInflater layoutInflater, Context context) {
|
||||
isLiveTab = false;
|
||||
this.context = context;
|
||||
// this.superVehHash = vehicles;
|
||||
mWindow = layoutInflater.inflate(R.layout.map_marker_info_bubble, null);
|
||||
}
|
||||
|
||||
@ -72,7 +73,7 @@ public class GoogleMapsInfoBubble implements GoogleMap.InfoWindowAdapter {
|
||||
}
|
||||
} else {
|
||||
try {
|
||||
position = Integer.parseInt(marker.getTitle());
|
||||
position = Integer.getInteger(marker.getTitle());
|
||||
} catch (Exception e) {
|
||||
Log.v(TAG, "Unable to parse Google Maps Info Bubble title on History");
|
||||
}
|
||||
|
||||
@ -100,17 +100,6 @@ public class HistoryActivity extends AppCompatActivity implements OnMapReadyCall
|
||||
}
|
||||
});
|
||||
|
||||
ImageView mapType = findViewById(R.id.changeMapTypeHeader);
|
||||
mapType.setOnClickListener(view -> {
|
||||
if (googleMap.getMapType() != GoogleMap.MAP_TYPE_SATELLITE) {
|
||||
mapType.setImageResource(R.drawable.map);
|
||||
googleMap.setMapType(GoogleMap.MAP_TYPE_SATELLITE);
|
||||
} else {
|
||||
mapType.setImageResource(R.drawable.satellite);
|
||||
googleMap.setMapType(GoogleMap.MAP_TYPE_NORMAL);
|
||||
}
|
||||
});
|
||||
|
||||
setDate();
|
||||
}
|
||||
|
||||
|
||||
@ -145,11 +145,11 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
|
||||
// image View for changing map type satellite or map
|
||||
ImageView changeMapTypeImageView = findViewById(R.id.changeMapType);
|
||||
changeMapTypeImageView.setOnClickListener(v -> {
|
||||
if (googleMap.getMapType() != GoogleMap.MAP_TYPE_SATELLITE) {
|
||||
changeMapTypeImageView.setImageResource(R.drawable.map);
|
||||
if (googleMap.getMapType() == GoogleMap.MAP_TYPE_SATELLITE) {
|
||||
changeMapTypeImageView.setImageResource(R.drawable.satellite);
|
||||
googleMap.setMapType(GoogleMap.MAP_TYPE_SATELLITE);
|
||||
} else {
|
||||
changeMapTypeImageView.setImageResource(R.drawable.satellite);
|
||||
changeMapTypeImageView.setImageResource(R.drawable.map);
|
||||
googleMap.setMapType(GoogleMap.MAP_TYPE_NORMAL);
|
||||
}
|
||||
});
|
||||
@ -687,7 +687,7 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
|
||||
// change check image for selected value
|
||||
VehiclesGridViewAdapter.ViewHolder viewLive = (VehiclesGridViewAdapter.ViewHolder) view.getTag();
|
||||
|
||||
if (displayedVehicles.get(position))
|
||||
if (Boolean.TRUE.equals(displayedVehicles.get(position)))
|
||||
viewLive.imgViewChecked.setImageResource(R.drawable.checked);
|
||||
else
|
||||
viewLive.imgViewChecked.setImageResource(R.drawable.unchecked);
|
||||
@ -695,16 +695,16 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
|
||||
// check if all values are identical
|
||||
boolean identical = true;
|
||||
for (Boolean displ : displayedVehicles)
|
||||
if (displ != displayedVehicles.get(0)) {
|
||||
if (!Objects.equals(displ, displayedVehicles.get(0))) {
|
||||
identical = false;
|
||||
break;
|
||||
}
|
||||
|
||||
// change image when all values are identical
|
||||
if (identical && displayedVehicles.get(0)) {
|
||||
if (identical && Boolean.TRUE.equals(displayedVehicles.get(0))) {
|
||||
imageViewCheckAll.setSelected(true);
|
||||
imageViewCheckAll.setBackgroundResource(R.drawable.check_all);
|
||||
} else {
|
||||
} else if (identical && Boolean.TRUE.equals(!displayedVehicles.get(0))) {
|
||||
imageViewCheckAll.setSelected(false);
|
||||
imageViewCheckAll.setBackgroundResource(R.drawable.uncheck_all);
|
||||
}
|
||||
|
||||
@ -21,16 +21,11 @@ public class NotificationActivity extends Activity{
|
||||
|
||||
// broadcast intent
|
||||
Intent i = new Intent();
|
||||
switch(key) {
|
||||
case AppParams.messageNotif:
|
||||
i.setAction(NOTIFICATION_MESSAGE_INTENT);
|
||||
break;
|
||||
case AppParams.alertNotif:
|
||||
i.setAction(NOTIFICATION_ALERT_INTENT);
|
||||
break;
|
||||
case AppParams.pollNotif:
|
||||
i.setAction(NOTIFICATION_POLL_INTENT);
|
||||
break;
|
||||
switch(key)
|
||||
{
|
||||
case AppParams.messageNotif: i.setAction(NOTIFICATION_MESSAGE_INTENT); break;
|
||||
case AppParams.alertNotif: i.setAction(NOTIFICATION_ALERT_INTENT); break;
|
||||
case AppParams.pollNotif: i.setAction(NOTIFICATION_POLL_INTENT); break;
|
||||
}
|
||||
|
||||
getBaseContext().sendBroadcast(i);
|
||||
@ -40,4 +35,6 @@ public class NotificationActivity extends Activity{
|
||||
/* Finish activity and return to parent activity */
|
||||
finish();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -89,8 +89,6 @@
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
|
||||
<RelativeLayout
|
||||
android:id="@+id/layoutNewMessage"
|
||||
android:layout_width="350dp"
|
||||
|
||||
@ -166,7 +166,7 @@
|
||||
<GridView
|
||||
android:id="@+id/gridView1"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="#999999"
|
||||
android:drawSelectorOnTop="false"
|
||||
android:horizontalSpacing="0dp"
|
||||
|
||||
@ -164,7 +164,7 @@
|
||||
<GridView
|
||||
android:id="@+id/gridView1"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="#999999"
|
||||
android:drawSelectorOnTop="false"
|
||||
android:horizontalSpacing="0dp"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user