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

Merge pull request 'features/SD-211-recordings-tab' (#14) from features/SD-211-recordings-tab into develop

Browse Source 
Reviewed-on: #14
This commit is contained in:
Bogdan Ungureanu 2022-03-30 11:26:25 +00:00
commit 5cd598bec9
13 changed files with 945 additions and 935 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

289
libSafeMobile/src/main/java/com/safemobile/adapters/RecordingsGridViewAdapter.java
View File

@ -1,18 +1,8 @@
package com.safemobile.adapters; package com.safemobile.adapters;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.Hashtable;
import java.util.Locale;
import java.util.TimeZone;
import android.app.Activity; import android.app.Activity;
import android.content.Context;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.BaseAdapter; import android.widget.BaseAdapter;
import android.widget.ImageView; import android.widget.ImageView;
@ -20,33 +10,31 @@ import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import com.safemobile.activities.AbstractRecordingsActivity; import com.safemobile.activities.AbstractRecordingsActivity;
import com.safemobile.lib.AppParams;
import com.safemobile.lib.R; import com.safemobile.lib.R;
import com.safemobile.lib.Recording; import com.safemobile.lib.Recording;
import com.safemobile.lib.Contact;
import com.safemobile.lib.SM; import com.safemobile.lib.SM;
public class RecordingsGridViewAdapter extends BaseAdapter import java.text.SimpleDateFormat;
{ import java.util.ArrayList;
private ArrayList<Recording> listRecordings; import java.util.Calendar;
private ArrayList<Boolean> recordingExists; import java.util.Date;
private ArrayList<Boolean> playingPositions; import java.util.Hashtable;
private Activity activity;
private Context context;
private int removePosition = -1;
//public String time;
//private int[] colors = new int[] { Color.parseColor("#FFFFFF"), Color.parseColor("#D2E4FC") };
private Hashtable<Integer, View> hash = new Hashtable<Integer, View>();
public RecordingsGridViewAdapter(Activity activity, Context context, ArrayList<Recording> listRecordings, ArrayList<Boolean> recordingExists) public class RecordingsGridViewAdapter extends BaseAdapter {
{ private final ArrayList<Recording> listRecordings;
private final ArrayList<Boolean> recordingExists;
private final ArrayList<Boolean> playingPositions;
private final Activity activity;
private final Hashtable<Integer, View> hash = new Hashtable<>();
public RecordingsGridViewAdapter(Activity activity, ArrayList<Recording> listRecordings, ArrayList<Boolean> recordingExists) {
super(); super();
this.activity = activity; this.activity = activity;
this.context = context;
this.listRecordings = listRecordings; this.listRecordings = listRecordings;
this.recordingExists = recordingExists; this.recordingExists = recordingExists;
playingPositions = new ArrayList<Boolean>(); playingPositions = new ArrayList<>();
for (int i = 0; i < recordingExists.size(); i++) { for (int i = 0; i < recordingExists.size(); i++) {
playingPositions.add(false); playingPositions.add(false);
@ -70,185 +58,184 @@ public class RecordingsGridViewAdapter extends BaseAdapter
return 0; return 0;
} }
/** Define Row Template */ /**
public static class ViewHolder * Define Row Template
{ */
public LinearLayout layoutRecording; public static class ViewHolder {
public ImageView imageViewPlay, imageViewRecycle; private LinearLayout layoutRecording;
public TextView textViewSender, textViewDuration, textViewDate; private ImageView imageViewPlay;
private ImageView imageViewRecycle;
private TextView textViewSender;
private TextView textViewDuration;
private TextView textViewDate;
public LinearLayout getLayoutRecording() {
return layoutRecording;
}
public void setLayoutRecording(LinearLayout layoutRecording) {
this.layoutRecording = layoutRecording;
}
public ImageView getImageViewPlay() {
return imageViewPlay;
}
public void setImageViewPlay(ImageView imageViewPlay) {
this.imageViewPlay = imageViewPlay;
}
public ImageView getImageViewRecycle() {
return imageViewRecycle;
}
public void setImageViewRecycle(ImageView imageViewRecycle) {
this.imageViewRecycle = imageViewRecycle;
}
public TextView getTextViewSender() {
return textViewSender;
}
public void setTextViewSender(TextView textViewSender) {
this.textViewSender = textViewSender;
}
public TextView getTextViewDuration() {
return textViewDuration;
}
public void setTextViewDuration(TextView textViewDuration) {
this.textViewDuration = textViewDuration;
}
public TextView getTextViewDate() {
return textViewDate;
}
public void setTextViewDate(TextView textViewDate) {
this.textViewDate = textViewDate;
}
} }
@Override @Override
public View getView(final int position, View convertView, ViewGroup parent) { public View getView(final int position, View convertView, ViewGroup parent) {
final ViewHolder view; final ViewHolder view;
LayoutInflater inflator = activity.getLayoutInflater(); LayoutInflater layoutInflater = activity.getLayoutInflater();
if(convertView==null) if (convertView == null) {
{
view = new ViewHolder(); view = new ViewHolder();
convertView = inflator.inflate(R.layout.row_recordings, null); convertView = layoutInflater.inflate(R.layout.row_recordings, null);
view.layoutRecording = (LinearLayout) convertView.findViewById(R.id.layoutRecording); view.setLayoutRecording(convertView.findViewById(R.id.layoutRecording));
view.imageViewPlay = (ImageView) convertView.findViewById(R.id.imageViewPlay); view.setImageViewPlay(convertView.findViewById(R.id.imageViewPlay));
view.textViewSender = (TextView) convertView.findViewById(R.id.textViewSender); view.setTextViewSender(convertView.findViewById(R.id.textViewSender));
view.textViewDuration = (TextView) convertView.findViewById(R.id.textViewDuration); view.setTextViewDuration(convertView.findViewById(R.id.textViewDuration));
view.textViewDate = (TextView) convertView.findViewById(R.id.textViewDate); view.setTextViewDate(convertView.findViewById(R.id.textViewDate));
view.imageViewRecycle = (ImageView) convertView.findViewById(R.id.imageViewRecycle); view.setImageViewRecycle(convertView.findViewById(R.id.imageViewRecycle));
view.imageViewRecycle.setVisibility(View.GONE); view.getImageViewRecycle().setVisibility(View.GONE);
convertView.setTag(view); convertView.setTag(view);
} } else {
else
{
view = (ViewHolder) convertView.getTag(); view = (ViewHolder) convertView.getTag();
} }
hash.put(position, convertView); hash.put(position, convertView);
/* if recording doesn't exists change background */ /* if recording doesn't exists change background */
if(!recordingExists.get(position)) if (Boolean.FALSE.equals(recordingExists.get(position)))
view.layoutRecording.setBackgroundColor(0xFFFFFFFF); view.getLayoutRecording().setBackgroundColor(0xFFFFFFFF);
else else {
{
/* if recording is not playing let background to white */ /* if recording is not playing let background to white */
if(!playingPositions.get(position)) if (Boolean.FALSE.equals(playingPositions.get(position)))
view.layoutRecording.setBackgroundColor(0xFFFFFFFF); view.getLayoutRecording().setBackgroundColor(0xFFFFFFFF);
else else
view.layoutRecording.setBackgroundColor(0xFF457c98); view.getLayoutRecording().setBackgroundColor(0xFF457c98);
} }
/* change icon according to call type [outgoing or incoming] */ /* change icon according to call type [outgoing or incoming] */
SM.Exception("REC TYPE : " + listRecordings.get(position).type); SM.Exception("REC TYPE : " + listRecordings.get(position).callType);
switch(listRecordings.get(position).type) switch (listRecordings.get(position).callType) {
{ case 6:
case AppParams.AllCall: view.getImageViewPlay().setImageResource(R.drawable.call_received_all);
if(listRecordings.get(position).destinationRadioID == 0)
view.imageViewPlay.setImageResource(R.drawable.call_received_all);
else
view.imageViewPlay.setImageResource(R.drawable.call_made_all);
break; break;
case AppParams.PrivateCall: case 2:
if(listRecordings.get(position).destinationRadioID == 0) view.getImageViewPlay().setImageResource(R.drawable.call_made_all);
view.imageViewPlay.setImageResource(R.drawable.call_received);
else
view.imageViewPlay.setImageResource(R.drawable.call_made);
break; break;
case AppParams.GroupCall: case 4:
if(listRecordings.get(position).destinationRadioID == 0) view.getImageViewPlay().setImageResource(R.drawable.call_received);
view.imageViewPlay.setImageResource(R.drawable.call_received_group);
else
view.imageViewPlay.setImageResource(R.drawable.call_made_group);
break; break;
case 0:
view.getImageViewPlay().setImageResource(R.drawable.call_made);
break;
case 5:
view.getImageViewPlay().setImageResource(R.drawable.call_received_group);
break;
case 1:
view.getImageViewPlay().setImageResource(R.drawable.call_made_group);
break;
default:
view.getImageViewPlay().setImageResource(R.drawable.alert);
} }
/*
try
{
if(receivedPositions.get(position))
{
if(playingPositions.get(position))
view.imageViewPlay.setImageResource(R.drawable.play_received);
else
view.imageViewPlay.setImageResource(R.drawable.call_received);
}
else
{
if(playingPositions.get(position))
view.imageViewPlay.setImageResource(R.drawable.play_made);
else
view.imageViewPlay.setImageResource(R.drawable.call_made);
}
}
catch(Exception ex)
{
SM.Exception("EXCeptioN", ex.toString());
view.imageViewPlay.setImageResource(R.drawable.play);
}*/
/* intercept Recycle click */ /* intercept Recycle click */
view.imageViewRecycle.setOnClickListener(new OnClickListener() { view.getImageViewRecycle().setOnClickListener(v -> {
@Override
public void onClick(View v) {
// save the position of the marked record
removePosition = position;
// change the background for marked record // change the background for marked record
View view = (View) hash.get(position); View view1 = hash.get(position);
ViewHolder viewHolder = (ViewHolder) view.getTag(); ViewHolder viewHolder = null;
viewHolder.layoutRecording.setBackgroundColor(0xFF457c98); if (view1 != null) {
((AbstractRecordingsActivity) activity).deleteSelected(position); viewHolder = (ViewHolder) view1.getTag();
} }
if (viewHolder != null) {
viewHolder.getLayoutRecording().setBackgroundColor(0xFF457c98);
}
((AbstractRecordingsActivity) activity).deleteSelected(position);
}); });
// set recording image view.getTextViewSender().setText(String.format("%s -> %s", getItem(position).userWhoCalled, getItem(position).userWhoWasCalled));
if(getItem(position).NameForDisplay.equals(AppParams.USERNAME)) view.textViewDuration.setText(String.format("[%d sec]", getItem(position).duration));
view.imageViewPlay.setImageDrawable(context.getResources().getDrawable(R.drawable.call_made_group));
else
view.imageViewPlay.setImageDrawable(context.getResources().getDrawable(R.drawable.call_received_group));
view.textViewSender.setText(getItem(position).NameForDisplay);
view.textViewDuration.setText("[" + getItem(position).duration + " sec]");
/* Add call Date */ /* Add call Date */
Date date = new Date(); Date date = new Date();
date.setTime(listRecordings.get(position).date * 1000); date.setTime(listRecordings.get(position).date * 1000);
SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss"); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH:mm:ss");
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
calendar.set(Calendar.HOUR_OF_DAY, 0); calendar.set(Calendar.HOUR_OF_DAY, 0);
calendar.set(Calendar.MINUTE, 0); calendar.set(Calendar.MINUTE, 0);
calendar.set(Calendar.SECOND, 0); calendar.set(Calendar.SECOND, 0);
calendar.set(Calendar.MILLISECOND, 0); calendar.set(Calendar.MILLISECOND, 0);
if (date.after(calendar.getTime())) if (date.after(calendar.getTime()))
sdf = new SimpleDateFormat("HH:mm:ss"); simpleDateFormat = new SimpleDateFormat("HH:mm:ss");
else else
sdf = new SimpleDateFormat("MMM-dd HH:mm"); simpleDateFormat = new SimpleDateFormat("MMM-dd HH:mm");
// set gmt time view.getTextViewDate().setText(simpleDateFormat.format(date));
//sdf.setTimeZone(TimeZone.getTimeZone("GMT"));
view.textViewDate.setText(sdf.format(date));
return convertView; return convertView;
} }
/**
/** Reset row background when recycle was canceled */ * Get the View for one row in the GridView
public void cancelDelete() */
{ public View getView(int position) {
View view = (View) hash.get(removePosition); return hash.get(position);
if(recordingExists.get(removePosition))
view.setBackgroundColor(0xFFFFFFFF);
else
view.setBackgroundColor(0xFFDDDDDD);
removePosition = -1;
} }
/**
/** Get the View for one row in the GridView */ * Change playing recording background
public View getView(int position) */
{ public void changePlaying(int position, boolean playing) {
return (View) hash.get(position);
}
/** Change playing recording background */
public void changePlaying(int position, boolean playing)
{
// change value in the vector // change value in the vector
playingPositions.set(position, playing); playingPositions.set(position, playing);
RecordingsGridViewAdapter.ViewHolder viewHolder = (RecordingsGridViewAdapter.ViewHolder) getView(position).getTag(); RecordingsGridViewAdapter.ViewHolder viewHolder = (RecordingsGridViewAdapter.ViewHolder) getView(position).getTag();
if (!playing) if (!playing)
viewHolder.layoutRecording.setBackgroundColor(0xFFFFFFFF); viewHolder.getLayoutRecording().setBackgroundColor(0xFFFFFFFF);
else else
viewHolder.layoutRecording.setBackgroundColor(0xFF457c98); viewHolder.getLayoutRecording().setBackgroundColor(0xFF457c98);
View view = hash.get(position);
// update hash // update hash
hash.get(position).setTag(viewHolder); if (view != null)
view.setTag(viewHolder);
} }
} }

6
libSafeMobile/src/main/java/com/safemobile/database/DatabaseCommunication.java
View File

@ -285,7 +285,7 @@ public class DatabaseCommunication {
while (cursor.isAfterLast() == false) while (cursor.isAfterLast() == false)
{ {
Recording rec = new Recording(); Recording rec = new Recording();
rec.ID =cursor.getInt(0); rec.id =cursor.getInt(0);
rec.sourceRadioID = cursor.getInt(1); rec.sourceRadioID = cursor.getInt(1);
rec.destinationRadioID = cursor.getInt(2); rec.destinationRadioID = cursor.getInt(2);
rec.date = cursor.getInt(3); rec.date = cursor.getInt(3);
@ -315,7 +315,7 @@ public class DatabaseCommunication {
if(cursor.getCount() > 0) if(cursor.getCount() > 0)
{ {
Recording rec = new Recording(); Recording rec = new Recording();
rec.ID =cursor.getInt(0); rec.id =cursor.getInt(0);
rec.sourceRadioID = cursor.getInt(1); rec.sourceRadioID = cursor.getInt(1);
rec.destinationRadioID = cursor.getInt(2); rec.destinationRadioID = cursor.getInt(2);
rec.date = cursor.getInt(3); rec.date = cursor.getInt(3);
@ -364,7 +364,7 @@ public class DatabaseCommunication {
values.put("duration", rec.duration); values.put("duration", rec.duration);
values.put("filename", rec.filename); values.put("filename", rec.filename);
values.put("type", rec.type); values.put("type", rec.type);
id = database.delete("Recordings", "_id=" + rec.ID, null); id = database.delete("Recordings", "_id=" + rec.id, null);
SM.Debug("DBQuery","Database Remove result: " + id); SM.Debug("DBQuery","Database Remove result: " + id);
} }
//INSERT into SMS (timeGMT, imei_sour, imei_dest, mess, status) VALUES( 1324016412, 0, 101, 'two', 1) //INSERT into SMS (timeGMT, imei_sour, imei_dest, mess, status) VALUES( 1324016412, 0, 101, 'two', 1)

51
libSafeMobile/src/main/java/com/safemobile/lib/RecordMSG.java
View File

@ -4,36 +4,43 @@ import java.util.ArrayList;
public class RecordMSG extends TCPmsg { public class RecordMSG extends TCPmsg {
public ArrayList<Recording> recordList; private ArrayList<Recording> recordList;
public static int count=0;
public RecordMSG(TCPmsg tcp) public RecordMSG(TCPmsg tcp) {
{
super(tcp); super(tcp);
recordList = new ArrayList<Recording>(); setRecordList(new ArrayList<>());
String date4parsing = super.data; String date4parsing = super.data;
//SM.Debug("SMS date4parsing:"+date4parsing);
String[] tempArr = date4parsing.split(";"); String[] tempArr = date4parsing.split(";");
//SM.Debug("SMS tempArr.length:" +tempArr.length); for (String s : tempArr) {
for(int i =0; i<tempArr.length;i++) String[] tempRec = s.split("&", -1);
{ if (tempRec.length < 11)
String[] tempRec = tempArr[i].split("&");
if(tempRec.length<7)
continue; continue;
Recording RecValue = new Recording(); Recording recValue = new Recording();
RecValue.ID = Long.parseLong(tempRec[0]); recValue.id = Long.parseLong(tempRec[0]);
RecValue.startGMT = Integer.parseInt(tempRec[1]); recValue.startGMT = Integer.parseInt(tempRec[1]);
RecValue.endGMT = Integer.parseInt(tempRec[2]); recValue.endGMT = Integer.parseInt(tempRec[2]);
RecValue.gwID = Integer.parseInt(tempRec[3]); recValue.gwID = Integer.parseInt(tempRec[3]);
RecValue.radioGWID = Integer.parseInt(tempRec[4]); recValue.radioGWID = Integer.parseInt(tempRec[4]);
RecValue.subID = Integer.parseInt(tempRec[5]); recValue.subID = (tempRec[5] == null || tempRec[5].isEmpty()) ? 0 : Integer.parseInt(tempRec[5]);
RecValue.typeID = Integer.parseInt(tempRec[6]); recValue.typeID = Integer.parseInt(tempRec[6]);
recValue.callType = Integer.parseInt(tempRec[7]);
recValue.groupCpsId = (tempRec[8] == null || tempRec[8].isEmpty()) ? 0 : Integer.parseInt(tempRec[8]);
recValue.dispatcherId = (tempRec[9] == null || tempRec[9].isEmpty()) ? 0 : Integer.parseInt(tempRec[9]);
recValue.groupName = tempRec[10];
recordList.add(RecValue); getRecordList().add(recValue);
} }
count +=this.recordList.size(); SM.Debug("alarmList size:" + this.getRecordList().size() + " total:" + this.getRecordList().size());
SM.Debug("alarmList size:" +this.recordList.size() + " total:" +count); }
public ArrayList<Recording> getRecordList() {
return recordList;
}
public void setRecordList(ArrayList<Recording> recordList) {
this.recordList = recordList;
} }
} }

16
libSafeMobile/src/main/java/com/safemobile/lib/Recording.java
View File

@ -1,14 +1,19 @@
package com.safemobile.lib; package com.safemobile.lib;
public class Recording { public class Recording {
public long ID; public long id;
public int startGMT; public int startGMT;
public int endGMT; public int endGMT;
public int gwID; public int gwID;
public int radioGWID; public int radioGWID;
public int callType;
public int groupCpsId;
public int dispatcherId;
public int subID; public int subID;
public int typeID; public int typeID;
public String NameForDisplay=""; public String userWhoCalled="";
public String userWhoWasCalled = "";
public String groupName = "";
/** RadioPad */ /** RadioPad */
public long date; public long date;
@ -18,13 +23,8 @@ public class Recording {
public long sourceRadioID; public long sourceRadioID;
public int type; public int type;
public Recording()
{
}
public String toString() public String toString()
{ {
return "ID: " + ID + " | start: " + startGMT + " | end: " + endGMT + " | gwID: " + gwID + " | radioGWID: " + radioGWID + " | subID: " + subID + " | typeID: " + typeID; return "id: " + id + " | start: " + startGMT + " | end: " + endGMT + " | gwID: " + gwID + " | radioGWID: " + radioGWID + " | subID: " + subID + " | typeID: " + typeID;
} }
} }

85
libSafeMobile/src/main/java/com/safemobile/services/TCPhandler.java
View File

@ -1,10 +1,4 @@
package com.safemobile.services; package com.safemobile.services;
import java.io.*;
import java.net.*;
import java.util.LinkedList;
import java.util.NoSuchElementException;
import java.util.Timer;
import java.util.TimerTask;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
@ -17,6 +11,17 @@ import com.safemobile.lib.AppParams;
import com.safemobile.lib.SM; import com.safemobile.lib.SM;
import com.safemobile.lib.TCPmsg; import com.safemobile.lib.TCPmsg;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.net.UnknownHostException;
import java.util.LinkedList;
import java.util.NoSuchElementException;
import java.util.Timer;
import java.util.TimerTask;
public class TCPhandler implements Runnable { public class TCPhandler implements Runnable {
private boolean alive = true; private boolean alive = true;
@ -108,26 +113,25 @@ public class TCPhandler implements Runnable {
SM.Debug("TCPhandler Crash1 on sleep:"+ e); SM.Debug("TCPhandler Crash1 on sleep:"+ e);
} }
while(isConnectionUP) { while (Boolean.TRUE.equals(isConnectionUP)) {
try { try {
Thread.sleep(100); Thread.sleep(100);
//process leftover
try { try {
boolean FinishLeftOver = true; boolean FinishLeftOver = true;
while (FinishLeftOver) { while (FinishLeftOver) {
// add this replacement if message length doesn't contain the last #
String[] tempArr2 = leftOver.split("#"); String[] tempArr2 = leftOver.split("#");
if (tempArr2.length > 1) { if (tempArr2.length > 1) {
int messLen; int messLen;
try { try {
messLen = Integer.parseInt(tempArr2[1]); messLen = Integer.parseInt(tempArr2[1]);
//TODO talk to Gaby to fix this on Bridge
} catch (Exception e) { } catch (Exception e) {
SM.Debug("leftovers", "incorect msg len leftOver =" + tempArr2[1]); SM.Debug("leftovers", "incorect msg len leftOver =" + tempArr2[1]);
messLen = -1; messLen = -1;
} }
if (messLen > leftOver.length()) { if (messLen > leftOver.length()) {
FinishLeftOver = false;
break; break;
} else if (messLen == leftOver.length()) { } else if (messLen == leftOver.length()) {
TCPmsg msg = new TCPmsg(leftOver.toCharArray()); TCPmsg msg = new TCPmsg(leftOver.toCharArray());
@ -138,8 +142,10 @@ public class TCPhandler implements Runnable {
msgList.add(msg); msgList.add(msg);
leftOver = ""; leftOver = "";
FinishLeftOver = false;
break; break;
} else { // we have more message in leftover } else // we have more message in leftover
{
TCPmsg msg = new TCPmsg(leftOver.substring(0, messLen).toCharArray()); TCPmsg msg = new TCPmsg(leftOver.substring(0, messLen).toCharArray());
SM.Debug("leftovers", "RX from leftOver:" + msg.allData); SM.Debug("leftovers", "RX from leftOver:" + msg.allData);
@ -147,15 +153,17 @@ public class TCPhandler implements Runnable {
prioritizePongReceived(); prioritizePongReceived();
msgList.add(msg); msgList.add(msg);
leftOver = leftOver.substring(messLen); leftOver = leftOver.substring(messLen, leftOver.length());
} }
} else FinishLeftOver = false; } else FinishLeftOver = false;
} }
} catch (Exception e) { } catch (Exception e) {
SM.Debug("leftovers", "Error on process leftover"+ e); SM.Debug("leftovers", "Error on process leftover" + e.toString());
} }
String data; //end process leftover
int n;
String data = "";
int n = 0;
byte[] buf = new byte[1024]; byte[] buf = new byte[1024];
// read data into buffer // read data into buffer
@ -171,10 +179,11 @@ public class TCPhandler implements Runnable {
} }
byte[] temp = new byte[n]; byte[] temp = new byte[n];
System.arraycopy(buf, 0, temp, 0, n); if (n >= 0) System.arraycopy(buf, 0, temp, 0, n);
// decryptData // decryptData
temp = decryptTEA(temp); temp = decryptTEA(temp);
data = new String(temp); data = new String(temp);
//if we have any leftovers from previous message add them //if we have any leftovers from previous message add them
@ -236,7 +245,7 @@ public class TCPhandler implements Runnable {
} }
//try to restart connection //try to restart connection
if (alive && isWiFiOn) if (alive && isWiFiOn)
RestartTCP(); restartTCP();
} }
SM.Debug("=================================="); SM.Debug("==================================");
SM.Debug("TCP listenThread stoped!! alive = false"); SM.Debug("TCP listenThread stoped!! alive = false");
@ -278,26 +287,36 @@ public class TCPhandler implements Runnable {
try { try {
Thread.sleep(10); Thread.sleep(10);
String cmdok = "#" + seqID + msg; String cmdok = "#" + seqID + msg;
int tmp = cmdok.length() + 1; Integer tmp = cmdok.length() + 1;
//SM.Debug("tmp:"+tmp);
tmp += Integer.toString(tmp).length(); tmp += Integer.toString(tmp).length();
if ((tmp == 10) || (tmp == 100) || (tmp == 1000)) tmp++; if ((tmp == 10) || (tmp == 100) || (tmp == 1000)) tmp++;
cmdok = "#" + tmp + cmdok; cmdok = "#" + Integer.toString(tmp) + cmdok;
byte[] mess = encryptTEA(cmdok); byte[] mess = encryptTEA(cmdok);
Thread tcpThread = new Thread(() -> {
try {
output.write(mess); output.write(mess);
output.flush(); output.flush();
} catch (Exception e) {
e.printStackTrace();
}
});
tcpThread.start();
// show only notACK messages
SM.Debug(" ", new String(mess)); SM.Debug(" ", new String(mess));
return true; return true;
} catch (IOException | NoSuchElementException | InterruptedException e) { } catch (InterruptedException e) {
SM.Exception("TCPClient[Send]", e.toString());
Thread.currentThread().interrupt();
} catch (NoSuchElementException e) {
SM.Exception("TCPClient[Send]", e.toString()); SM.Exception("TCPClient[Send]", e.toString());
} }
} else } else {
return false; return false;
}
} catch (Exception e) { } catch (Exception e) {
SM.Debug("TCPhandler Write Procedure:" + e); SM.Debug("TCPhandler Write Procedure:" + e);
} }
@ -350,7 +369,7 @@ public class TCPhandler implements Runnable {
TCPmsgParser._fireTCPConnectionUpEvent(previousConnectionWasUP); TCPmsgParser._fireTCPConnectionUpEvent(previousConnectionWasUP);
} }
private void RestartTCP() { private void restartTCP() {
try { try {
isConnectionUP = false; isConnectionUP = false;
previousConnectionWasUP = false; previousConnectionWasUP = false;
@ -363,13 +382,21 @@ public class TCPhandler implements Runnable {
//output stream //output stream
output = new DataOutputStream(soc.getOutputStream()); output = new DataOutputStream(soc.getOutputStream());
if (soc != null) if (soc != null) {
isConnectionUP = true; isConnectionUP = true;
} catch (NullPointerException | IOException e) { }
SM.Exception("RestartTCP break:"+ e);
} catch (UnknownHostException e) {
SM.Exception("restartTCP break:" + e.toString());
isConnectionUP = false; isConnectionUP = false;
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
SM.Debug("IllegalArgumentException", "RestartTCP break:"+ e); SM.Debug("IllegalArgumentException", "restartTCP break:" + e.toString());
} catch (IOException e) {
SM.Exception("restartTCP break:" + e.toString());
isConnectionUP = false;
} catch (NullPointerException e) {
SM.Exception("restartTCP break:" + e.toString());
isConnectionUP = false;
} }
triggerTCPConnectionStateEvent(); triggerTCPConnectionStateEvent();
} }

1
safeDispatch/src/main/AndroidManifest.xml
View File

@ -45,7 +45,6 @@
android:name="com.safemobile.safedispatch.SDMobileActivity" android:name="com.safemobile.safedispatch.SDMobileActivity"
android:configChanges="orientation" android:configChanges="orientation"
android:exported="true" android:exported="true"
android:label="@string/app_name_demo"
android:screenOrientation="landscape"> android:screenOrientation="landscape">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />

6
safeDispatch/src/main/java/com/safemobile/lib/sound/AudioHandle.java
View File

@ -22,7 +22,7 @@ public class AudioHandle implements Runnable{
private DataOutputStream outData =null; private DataOutputStream outData =null;
private Thread t_micListner; private Thread t_micListner;
private UDPclient udp; private UDPclient udp;
private TCPaudioClient tcp; private TcpAudioClient tcp;
private int audioport = 50001; private int audioport = 50001;
public int typeUDP; public int typeUDP;
@ -56,7 +56,7 @@ public class AudioHandle implements Runnable{
else else
{ {
try { try {
tcp = new TCPaudioClient(IP,audioport); tcp = new TcpAudioClient(IP,audioport);
bufferSize = AudioTrack.getMinBufferSize(SAMPLE_RATE, AudioFormat.CHANNEL_OUT_MONO, AudioFormat.ENCODING_PCM_16BIT); bufferSize = AudioTrack.getMinBufferSize(SAMPLE_RATE, AudioFormat.CHANNEL_OUT_MONO, AudioFormat.ENCODING_PCM_16BIT);
@ -155,7 +155,7 @@ public class AudioHandle implements Runnable{
/* /*
tempBuffer = new byte[16384];//128];//invers3.bufferSize]; tempBuffer = new byte[16384];//128];//invers3.bufferSize];
bRead = recDev.read(tempBuffer, 0,16384);// 128);//invers3.bufferSize);*/ bRead = recDev.read(tempBuffer, 0,16384);// 128);//invers3.bufferSize);*/
tcp.Send(tempBuffer,bRead); tcp.send(tempBuffer,bRead);
SM.Debug("TCP sending b:"+bRead); SM.Debug("TCP sending b:"+bRead);
} }
} }

85
safeDispatch/src/main/java/com/safemobile/lib/sound/RecordingHandle.java
View File

@ -1,84 +1,65 @@
package com.safemobile.lib.sound; package com.safemobile.lib.sound;
import com.safemobile.lib.SM;
import android.media.AudioFormat; import android.media.AudioFormat;
import android.media.AudioManager; import android.media.AudioManager;
import android.media.AudioRecord;
import android.media.AudioTrack; import android.media.AudioTrack;
import android.media.MediaRecorder;
import com.safemobile.lib.SM;
public class RecordingHandle { public class RecordingHandle {
public Boolean isAlive = false; private Boolean soundNeeded = false;
public Boolean soundNeeded = false;
private AudioTrack playDev = null; private AudioTrack playDev = null;
private int bufferSize;
private TCPaudioClient tcp;
private int recport = 50002;
public RecordingHandle(String IP) public RecordingHandle(String ip) {
{
try { try {
tcp = new TCPaudioClient(IP,recport); final int RECORDING_PORT = 50003;
int sampleRate = 8000; TcpAudioClient tcp = new TcpAudioClient(ip, RECORDING_PORT);
int bufsize = AudioTrack.getMinBufferSize(sampleRate, AudioFormat.CHANNEL_OUT_MONO, AudioFormat.ENCODING_PCM_16BIT); final int sampleRate = 8000;
int bufferSize = AudioTrack.getMinBufferSize(sampleRate, AudioFormat.CHANNEL_OUT_MONO, AudioFormat.ENCODING_PCM_16BIT);
//init play device //init play device
playDev = new AudioTrack(AudioManager.STREAM_MUSIC,sampleRate,AudioFormat.CHANNEL_OUT_MONO, AudioFormat.ENCODING_PCM_16BIT,bufsize, AudioTrack.MODE_STREAM); playDev = new AudioTrack(AudioManager.STREAM_MUSIC, sampleRate, AudioFormat.CHANNEL_OUT_MONO, AudioFormat.ENCODING_PCM_16BIT, bufferSize, AudioTrack.MODE_STREAM);
tcp.addTCPListener(new ITCPaudioLis() tcp.addTCPListener(event -> {
{
@Override
public void dataRecv(TCPaudioEvent event) {
byte[] data = event.data(); byte[] data = event.data();
int len = event.len(); int len = event.len();
SM.Debug("recv b:"+len+" data.length:"+data.length); SM.Debug("received b:" + len + " data.length:" + data.length);
if(data!=null) playSound(data);
PlaySound(data, len);
}
}); });
} } catch (Exception ex) {
catch(Exception ex) {
SM.Exception("recordings", ex.toString()); SM.Exception("recordings", ex.toString());
} }
} }
private void PlaySound(byte[] data, int len) private void playSound(byte[] data) {
{ if (Boolean.TRUE.equals(getSoundNeeded())) {
if(soundNeeded) if (playDev.getState() == AudioTrack.STATE_INITIALIZED) {
{
if(playDev.getState() == playDev.STATE_INITIALIZED)
{
playDev.write(data, 0, data.length); playDev.write(data, 0, data.length);
playDev.play(); playDev.play();
} else {
} SM.Debug("Cannot play sound playDev NOT init correctly");
else
{
SM.Debug("Cannot play sound playDev NOT init corectly");
} }
} }
} }
public void StartSound() public void startSound() {
{ setSoundNeeded(true);
soundNeeded = true;
} }
public void StopSound() public void stopSound() {
{ if (playDev != null && playDev.getState() == AudioTrack.STATE_INITIALIZED) {
if(playDev.getState() == playDev.STATE_INITIALIZED) if (playDev.getPlayState() == AudioTrack.PLAYSTATE_PLAYING)
{
if(playDev.getPlayState() == playDev.PLAYSTATE_PLAYING)
playDev.stop(); playDev.stop();
} else {
}
else
{
SM.Debug("Cannot STOP playDev"); SM.Debug("Cannot STOP playDev");
} }
soundNeeded= false; setSoundNeeded(false);
}
public Boolean getSoundNeeded() {
return soundNeeded;
}
public void setSoundNeeded(Boolean soundNeeded) {
this.soundNeeded = soundNeeded;
} }
} }

195
safeDispatch/src/main/java/com/safemobile/lib/sound/TCPaudioClient.java
View File

@ -1,195 +0,0 @@
package com.safemobile.lib.sound;
import com.safemobile.lib.SM;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.Socket;
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
public class TCPaudioClient implements Runnable{
private boolean alive = true;
public String serverHostname = new String ("10.120.1.114");//
private int port = 50001;
private Thread listenThread;
private Socket soc =null;
private InputStream recv;
private OutputStream writer;
private volatile int n=0;
public Boolean connOK=false;
byte[] buffer = new byte[16384];
private List<ITCPaudioLis> _listeners = new ArrayList<ITCPaudioLis>();
public TCPaudioClient(String hostName, int _port)
{
serverHostname=hostName;
this.port = _port;
SM.Debug("---TCPhandler construcort--- port:"+_port);
listenThread = new Thread(this, "TCPlisten");
listenThread.start(); // (2) Start the thread.
}
@Override
public void run()
{
try
{
soc = new Socket(serverHostname, port);
SM.Debug("Socket timeout:" + soc.getSoTimeout() );
//soc.setSoTimeout(5000);
recv= soc.getInputStream();
writer =soc.getOutputStream() ;
if(soc !=null)
connOK = true;
}
catch (UnknownHostException e)
{
SM.Debug("UnknownHostException", "break:"+e.toString());
}
catch (IOException e)
{
SM.Debug("IOException", "break:"+e.toString());
}
while(alive)
{
try {
Thread.sleep(3000);
} catch (InterruptedException e) {
// TODO Auto-generated catch block
SM.Debug(e.toString());
}
while(connOK)
{
try
{
buffer = new byte[16384];
n = recv.read(buffer);
if(n==-1)
break;
_fireDataArrived(buffer,n);
}
catch(Exception ex)
{
SM.Debug("break:"+ex.toString());
connOK = false;
}
}//while(connOK)
try {
Thread.sleep(3000);
} catch (InterruptedException e) {
// TODO Auto-generated catch block
SM.Debug(e.toString());
}
if(alive)RestartTCP();
}//while(alive)
SM.Debug("==================================");
SM.Debug("TCP listenThread stoped!! alive = false");
SM.Debug("==================================");
}
public boolean Send(byte[] data,int len)
{
try
{
if(writer != null)
{
writer.write(data,0,len);
return true;
}
else
{
return false;
}
}
catch (Exception e)
{
// TODO Auto-generated catch block
SM.Debug(e.toString());
}
return false;
}
private void RestartTCP()
{
try
{
SM.Debug("Restarting TCP...ip:"+serverHostname);
soc = new Socket(serverHostname, port);
recv= soc.getInputStream();
writer =soc.getOutputStream();
if(soc !=null)
connOK = true;
}
catch (UnknownHostException e)
{
SM.Debug("break:"+e.toString());
}
catch (IOException e)
{
SM.Debug("break:"+e.toString());
}
}
public boolean isAlive() {
return alive;
}
public void setAlive(boolean alive) {
this.alive = alive;
}
public void Stop()
{
this.alive = false;
if(soc !=null)
{
try {
soc.close();
soc = null;
} catch (IOException e) {
// TODO Auto-generated catch block
SM.Debug("break:"+e.toString());
}
connOK = false;
}
// stop thread
if(listenThread != null)
{
Thread moribund = listenThread;
listenThread = null;
moribund.interrupt();
}
}
public synchronized void addTCPListener( ITCPaudioLis l ) {
_listeners.add( (ITCPaudioLis) l );
}
public synchronized void removeTCPListener( ITCPaudioLis l ) {
_listeners.remove( l );
}
private synchronized void _fireDataArrived(byte[] data, int len) {
TCPaudioEvent event = new TCPaudioEvent( this, data, len );
Iterator<ITCPaudioLis> listeners = _listeners.iterator();
while( listeners.hasNext() ) {
( (ITCPaudioLis) listeners.next() ).dataRecv(event);
}
}
}

174
safeDispatch/src/main/java/com/safemobile/lib/sound/TcpAudioClient.java Normal file
View File

@ -0,0 +1,174 @@
package com.safemobile.lib.sound;
import com.safemobile.lib.SM;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.Socket;
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.List;
public class TcpAudioClient implements Runnable {
private boolean alive = true;
private String serverHostname;
private final int port;
private Thread listenThread;
private Socket soc = null;
private InputStream recv;
private OutputStream writer;
private Boolean connOK = false;
byte[] buffer = new byte[16384];
private final List<ITCPaudioLis> listeners = new ArrayList<>();
public TcpAudioClient(String hostName, int port) {
setServerHostname(hostName);
this.port = port;
SM.Debug("---TcpHandler constructor--- port:" + port);
listenThread = new Thread(this, "TcpListen");
listenThread.start(); // (2) Start the thread.
}
@Override
public void run() {
try {
soc = new Socket(getServerHostname(), port);
SM.Debug("Socket timeout:" + soc.getSoTimeout());
recv = soc.getInputStream();
writer = soc.getOutputStream();
if (soc != null)
setConnOK(true);
} catch (UnknownHostException e) {
SM.Debug("UnknownHostException", "break:" + e);
} catch (IOException e) {
SM.Debug("IOException", "break:" + e);
}
while (alive) {
try {
Thread.sleep(3000);
} catch (InterruptedException e) {
SM.Debug(e.toString());
Thread.currentThread().interrupt();
}
while (Boolean.TRUE.equals(getConnOK())) {
try {
buffer = new byte[16384];
int n = recv.read(buffer);
if (n == -1)
break;
fireDataArrived(buffer, n);
} catch (Exception ex) {
SM.Debug("break:" + ex);
setConnOK(false);
}
}
try {
Thread.sleep(3000);
} catch (InterruptedException e) {
SM.Debug(e.toString());
Thread.currentThread().interrupt();
}
if (alive) restartTCP();
}
SM.Debug("==================================");
SM.Debug("TCP listenThread stopped!! alive = false");
SM.Debug("==================================");
}
public boolean send(byte[] data, int len) {
try {
if (writer != null) {
writer.write(data, 0, len);
return true;
} else {
return false;
}
} catch (Exception e) {
SM.Debug(e.toString());
}
return false;
}
private void restartTCP() {
try {
SM.Debug("Restarting TCP...ip:" + getServerHostname());
soc = new Socket(getServerHostname(), port);
recv = soc.getInputStream();
writer = soc.getOutputStream();
setConnOK(true);
} catch (IOException e) {
SM.Debug("break:" + e);
}
}
public boolean isAlive() {
return alive;
}
public void setAlive(boolean alive) {
this.alive = alive;
}
public void stop() {
this.alive = false;
if (soc != null) {
try {
soc.close();
soc = null;
} catch (IOException e) {
SM.Debug("break:" + e);
}
setConnOK(false);
}
// stop thread
if (listenThread != null) {
Thread moribund = listenThread;
listenThread = null;
moribund.interrupt();
}
}
public synchronized void addTCPListener(ITCPaudioLis l) {
listeners.add(l);
}
public synchronized void removeTCPListener(ITCPaudioLis l) {
listeners.remove(l);
}
private synchronized void fireDataArrived(byte[] data, int len) {
TCPaudioEvent event = new TCPaudioEvent(this, data, len);
for (ITCPaudioLis listener : listeners) {
listener.dataRecv(event);
}
}
public String getServerHostname() {
return serverHostname;
}
public void setServerHostname(String serverHostname) {
this.serverHostname = serverHostname;
}
public Boolean getConnOK() {
return connOK;
}
public void setConnOK(Boolean connOK) {
this.connOK = connOK;
}
}

2
safeDispatch/src/main/java/com/safemobile/lib/sound/UDPclient.java
View File

@ -15,7 +15,7 @@ import com.safemobile.lib.SM;
public class UDPclient implements Runnable{ public class UDPclient implements Runnable{
public String serverHostname = new String ("10.120.1.114");// public String serverHostname = new String ("10.120.1.114");//
private int UDP_SERVER_PORT_IN = 50002; private int UDP_SERVER_PORT_IN = 50003;
private int UDP_SERVER_PORT_OUT = 50001; private int UDP_SERVER_PORT_OUT = 50001;
private DatagramSocket ds = null; private DatagramSocket ds = null;
private Thread listenThread; private Thread listenThread;

334
safeDispatch/src/main/java/com/safemobile/safedispatch/RecordingsActivity.java
View File

@ -2,10 +2,8 @@ package com.safemobile.safedispatch;
import android.app.Activity; import android.app.Activity;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.Dialog;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.content.res.AssetFileDescriptor; import android.content.res.AssetFileDescriptor;
@ -14,13 +12,12 @@ import android.graphics.Typeface;
import android.media.MediaPlayer; import android.media.MediaPlayer;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.os.Looper;
import android.view.View; import android.view.View;
import android.view.View.OnClickListener;
import android.widget.AdapterView; import android.widget.AdapterView;
import android.widget.AdapterView.OnItemClickListener; import android.widget.AdapterView.OnItemClickListener;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import android.widget.GridView; import android.widget.GridView;
import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
@ -36,63 +33,59 @@ import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Locale; import java.util.Locale;
/**
* fix import
*/
public class RecordingsActivity extends Activity { public class RecordingsActivity extends Activity {
private Context context; private Context context;
private Activity activity; private Activity activity;
public TabLayoutActivity parentTab; private TabLayoutActivity parentTab;
public ArrayList<Recording> allRecordings = new ArrayList<Recording>(); private ArrayList<Recording> allRecordings = new ArrayList<>();
private ArrayList<Boolean> playingPositions = new ArrayList<Boolean>(); private ArrayList<Boolean> playingPositions = new ArrayList<>();
private ArrayList<String> allGWsIP = new ArrayList<String>();
private GridView gridView; private GridView gridView;
private RecordingsGridViewAdapter adapter; private RecordingsGridViewAdapter adapter;
public View convertViewRecording; private View convertViewRecording;
public int playingPosition = -1; private int playingPosition = -1;
// Need handler for callbacks to the UI thread // Need handler for callbacks to the UI thread
private final Handler myHandler = new Handler(); private final Handler myHandler = new Handler(Looper.getMainLooper());
private final ArrayList<String> allGWsIP = new ArrayList<>();
//recoding TCP and audio //recoding TCP and audio
private RecordingHandle recHandle = null; private RecordingHandle recHandle = null;
/* Dialog */ /* Dialog */
private TextView textViewCount, textViewGateway; private TextView textViewCount;
private TextView textViewGateway;
public Bundle savedInstanceState; private Bundle savedInstanceState;
/** Called when the activity is first created. */ /**
* Called when the activity is first created.
*/
@Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
this.savedInstanceState = savedInstanceState; this.setSavedInstanceState(savedInstanceState);
// get parentTab setParentTab((TabLayoutActivity) getParent());
parentTab = (TabLayoutActivity)getParent();
Locale locale = new Locale(AppParams.LANGUAGETMP); Locale locale = new Locale(AppParams.LANGUAGETMP);
Locale.setDefault(locale); Locale.setDefault(locale);
Configuration config = new Configuration(); Configuration config = new Configuration();
config.locale = locale; config.locale = locale;
getBaseContext().getResources().updateConfiguration(config, getBaseContext().getResources().updateConfiguration(config, getBaseContext().getResources().getDisplayMetrics());
getBaseContext().getResources().getDisplayMetrics());
setContentView(R.layout.tabrecordings); setContentView(R.layout.tabrecordings);
// get context // get context
context = this; context = this;
activity = this; activity = this;
// change tab header fontFace
// change tab header fontface TextView textView1 = findViewById(R.id.textViewTitle);
TextView textView1 = (TextView) findViewById(R.id.textViewTitle);
textView1.setTypeface(Typeface.createFromAsset(getAssets(), "Sketch_Block.ttf")); textView1.setTypeface(Typeface.createFromAsset(getAssets(), "Sketch_Block.ttf"));
textView1.setTextSize(24); textView1.setTextSize(24);
gridView = (GridView) findViewById(R.id.gridViewRecordings); gridView = findViewById(R.id.gridViewRecordings);
adapter = new RecordingsGridViewAdapter(activity, context, allRecordings, playingPositions); adapter = new RecordingsGridViewAdapter(activity, getAllRecordings(), playingPositions);
gridView.setAdapter(adapter); gridView.setAdapter(adapter);
gridView.setOnItemClickListener(onItemClickListener); gridView.setOnItemClickListener(onItemClickListener);
@ -100,187 +93,150 @@ public class RecordingsActivity extends Activity {
if (recHandle == null && !AppParams.DEMO) if (recHandle == null && !AppParams.DEMO)
recHandle = new RecordingHandle(AppParams.IP); recHandle = new RecordingHandle(AppParams.IP);
textViewCount = findViewById(R.id.textViewCount);
textViewCount = (TextView) findViewById(R.id.textViewCount);
updateNumberOfRecordings(); updateNumberOfRecordings();
textViewGateway = (TextView) findViewById(R.id.textViewGateway); textViewGateway = findViewById(R.id.textViewGateway);
textViewGateway.setTypeface(Typeface.createFromAsset(getAssets(), "Sketch_Block.ttf")); textViewGateway.setTypeface(Typeface.createFromAsset(getAssets(), "Sketch_Block.ttf"));
textViewGateway.setTextSize(24); textViewGateway.setTextSize(24);
textViewGateway.setOnClickListener(new OnClickListener() { textViewGateway.setOnClickListener(v -> {
@Override
public void onClick(View v) {
allGWsIP.clear(); allGWsIP.clear();
for (RadioGW radio : AppParams.listRadios) for (RadioGW radio : AppParams.listRadios)
allGWsIP.add(radio.IP); allGWsIP.add(radio.IP);
ArrayAdapter<String> adapter = new ArrayAdapter<String>(context, R.layout.template_simple_list_item, ArrayAdapter<String> adapter = new ArrayAdapter<>(context, R.layout.template_simple_list_item,
allGWsIP); allGWsIP);
AlertDialog.Builder builder = new AlertDialog.Builder( AlertDialog.Builder builder = new AlertDialog.Builder(
context); context);
builder.setTitle("Select RadioGW"); builder.setTitle("Select RadioGW");
builder.setAdapter(adapter, builder.setAdapter(adapter,
new DialogInterface.OnClickListener() { (dialog, which) -> {
@Override
public void onClick(DialogInterface dialog, int which) {
// change gateway // change gateway
textViewGateway.setText(allGWsIP.get(which)); textViewGateway.setText(allGWsIP.get(which));
Toast.makeText(context, getString(R.string.loadingRecordings), Toast.LENGTH_SHORT).show(); Toast.makeText(context, getString(R.string.loadingRecordings), Toast.LENGTH_SHORT).show();
GetRecordings(parentTab.getAllRadios().get(which).GW_ID, parentTab.getAllRadios().get(which).ID); getRecordings(getParentTab().getAllRadios().get(which).GW_ID, getParentTab().getAllRadios().get(which).ID);
}
}); });
AlertDialog alert = builder.create(); AlertDialog alert = builder.create();
alert.show(); alert.show();
}
}); });
textViewGateway.setVisibility(View.INVISIBLE); textViewGateway.setVisibility(View.INVISIBLE);
getParentTab().setRecordingsActivity(this);
parentTab.setRecordingsActivity(this);
// register to receive broadcasts // register to receive broadcasts
registerBroadcastIntents(); registerBroadcastIntents();
} }
@Override @Override
public void onBackPressed() public void onBackPressed() {
{
AlertDialog.Builder builder = new AlertDialog.Builder(this); AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setMessage(getString(R.string.exit)) builder.setMessage(getString(R.string.exit))
.setCancelable(false) .setCancelable(false)
.setNeutralButton(getString(R.string.logout), new DialogInterface.OnClickListener() { .setNeutralButton(getString(R.string.logout), (dialog, id) -> getParentTab().whenBackPressed(AppParams.ActivityResult.logout))
public void onClick(DialogInterface dialog, int id) { .setPositiveButton(getString(R.string.ext), (dialog, id) -> getParentTab().whenBackPressed(AppParams.ActivityResult.exit))
parentTab.whenBackPressed(AppParams.ActivityResult.logout); .setNegativeButton(getString(R.string.cancel), (dialog, id) -> dialog.cancel());
}
})
.setPositiveButton(getString(R.string.ext), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
parentTab.whenBackPressed(AppParams.ActivityResult.exit);
}
})
.setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
dialog.cancel();
}
});
AlertDialog alert = builder.create(); AlertDialog alert = builder.create();
alert.show(); alert.show();
} }
/**
/** Update the number of recordings displayed on the top layout */ * Update the number of recordings displayed on the top layout
*/
private void updateNumberOfRecordings() { private void updateNumberOfRecordings() {
textViewCount.setText("[" + AppParams.recordings.size() + "]"); textViewCount.setText("[" + AppParams.recordings.size() + "]");
} }
public void showDialog(String errorMsg)
{
Dialog dialog = new Dialog(context);
dialog.setContentView(R.layout.dialog);
dialog.setTitle("Message");
dialog.setCancelable(true);
dialog.setCanceledOnTouchOutside(true);
TextView text = dialog.findViewById(R.id.text);
ImageView image = dialog.findViewById(R.id.image);
image.setImageResource(R.mipmap.ic_launcher);
text.setText(errorMsg);
dialog.show();
}
@Override @Override
public void onPause() public void onPause() {
{
super.onPause(); super.onPause();
SM.Debug("onPause"); SM.Debug("onPause");
} }
@Override @Override
public void onResume() public void onResume() {
{
super.onResume(); super.onResume();
if(parentTab.getTCPState() != null && !AppParams.DEMO){ if (getParentTab().getTCPState() != null && !AppParams.DEMO) {
Toast.makeText(context, getString(R.string.moreRecordings), Toast.LENGTH_SHORT).show(); Toast.makeText(context, getString(R.string.moreRecordings), Toast.LENGTH_SHORT).show();
if(parentTab.getCrtRadio() != null) if (getParentTab().getCrtRadio() != null)
textViewGateway.setText(parentTab.getCrtRadio().IP); textViewGateway.setText(getParentTab().getCrtRadio().IP);
/* if (getPlayingPosition() < 0 && getParentTab().getCrtRadio() != null) {
if(parentTab.allRadios == null) SM.Debug("getRecordings resume + crtRadio:" + getParentTab().getCrtRadio().toString());
GetGWRadios(); getRecordings(getParentTab().getCrtRadio().GW_ID, getParentTab().getCrtRadio().ID);
*/
if(playingPosition < 0 && parentTab.getCrtRadio() != null)
{
SM.Debug("GetRecordings resume + crtRadio:"+ parentTab.getCrtRadio().toString());
GetRecordings(parentTab.getCrtRadio().GW_ID, parentTab.getCrtRadio().ID);
} }
} }
SM.Debug("onResume"); SM.Debug("onResume");
} }
private OnItemClickListener onItemClickListener = new OnItemClickListener() { private final OnItemClickListener onItemClickListener = new OnItemClickListener() {
@Override @Override
public void onItemClick(AdapterView<?> arg0, View view, int position, long arg3) { public void onItemClick(AdapterView<?> arg0, View view, int position, long arg3) {
// disable grid scrolling and item click // disable grid scrolling and item click
gridView.setEnabled(false); gridView.setEnabled(false);
convertViewRecording = view; setConvertViewRecording(view);
// change background to playing // change background to playing
adapter.changePlaying(position, true); adapter.changePlaying(position, true);
// if no recording is playing and not DEMO // if no recording is playing and not DEMO
if(playingPosition<0 && !AppParams.DEMO) if (getPlayingPosition() < 0 && !AppParams.DEMO) {
{
// send recording request to App Server // send recording request to App Server
SendPlayRequest(allRecordings.get(position).ID); sendPlayRequest(getAllRecordings().get(position).id);
// flag that sound is needed // flag that sound is needed
recHandle.StartSound(); recHandle.startSound();
recHandle.soundNeeded = true; recHandle.setSoundNeeded(true);
} }
// no recording is playing and DEMO // no recording is playing and DEMO
else if(playingPosition<0 && AppParams.DEMO) else if (getPlayingPosition() < 0 && AppParams.DEMO) {
{
// create player which will play demo recordings // create player which will play demo recordings
MediaPlayer player = new MediaPlayer(); MediaPlayer player = new MediaPlayer();
AssetFileDescriptor afd; AssetFileDescriptor assetFileDescriptor = null;
try { try {
switch(position) switch (position) {
{ case 1:
case 1: afd = getAssets().openFd("startwindows.mp3"); break; assetFileDescriptor = getAssets().openFd("startwindows.mp3");
case 2: afd = getAssets().openFd("exitwindows.mp3"); break; break;
default : afd = getAssets().openFd("mike.mp3"); break; case 2:
}; assetFileDescriptor = getAssets().openFd("exitwindows.mp3");
player.setDataSource(afd.getFileDescriptor(),afd.getStartOffset(),afd.getLength()); break;
default:
assetFileDescriptor = getAssets().openFd("mike.mp3");
break;
}
player.setDataSource(assetFileDescriptor.getFileDescriptor(), assetFileDescriptor.getStartOffset(), assetFileDescriptor.getLength());
player.prepare(); player.prepare();
player.start(); player.start();
} catch (IOException e) { } } catch (IOException e) {
e.printStackTrace();
} finally {
if(assetFileDescriptor != null) {
try {
assetFileDescriptor.close();
} catch (IOException e) {
e.printStackTrace();
}
}
}
} }
// save playing position // save playing position
playingPosition = position; setPlayingPosition(position);
// start the timer which will reset the UI to 'no recording playing' // start the timer which will reset the UI to 'no recording playing'
startRecordingStoperTimer(allRecordings.get(playingPosition).endGMT - allRecordings.get(playingPosition).startGMT); startRecordingStopperTimer(getAllRecordings().get(getPlayingPosition()).endGMT - getAllRecordings().get(getPlayingPosition()).startGMT);
} }
};
/**
/** create Timer which will stop the recording after a specific time */ * create Timer which will stop the recording after a specific time
private void startRecordingStoperTimer(final int seconds) { */
new Thread(new Runnable() { private void startRecordingStopperTimer(final int seconds) {
new Thread(() -> {
@Override
public void run() {
// sleep for at least 1 second // sleep for at least 1 second
final int ms = (seconds > 1 ? seconds * 1000 : 1000); final int ms = (seconds > 1 ? seconds * 1000 : 1000);
@ -289,77 +245,57 @@ public class RecordingsActivity extends Activity {
Thread.sleep(ms); Thread.sleep(ms);
} catch (InterruptedException e) { } catch (InterruptedException e) {
e.printStackTrace(); e.printStackTrace();
Thread.currentThread().interrupt();
} }
// modify the UI after the recording is done playing // modify the UI after the recording is done playing
myHandler.post(stopRecordingRUN); myHandler.post(stopRecordingRUN);
}
}).start(); }).start();
} }
// Create runnable for posting
final Runnable stopRecordingRUN = new Runnable() {
@Override
public void run() {
updateStopRecording();
}
}; };
private void updateStopRecording() // Create runnable for posting
{ final Runnable stopRecordingRUN = this::updateStopRecording;
private void updateStopRecording() {
// change playing icon // change playing icon
adapter.changePlaying(playingPosition, false); adapter.changePlaying(getPlayingPosition(), false);
// enable grid // enable grid
gridView.setEnabled(true); gridView.setEnabled(true);
// set playing Recording position to -1 // set playing Recording position to -1
playingPosition = -1; setPlayingPosition(-1);
} }
// Update Recordings received from AppServer // Update Recordings received from AppServer
public void UpdateRecordings(ArrayList<Recording> list) public void updateRecordings(ArrayList<Recording> list) {
{ setAllRecordings(new ArrayList<>());
//SM.Debug("## UpdateRecordings: " + list.size()); for (Recording rec : list) {
allRecordings = new ArrayList<Recording>(); getAllRecordings().add(rec);
for(Recording rec : list)
{
if(rec.typeID == 1 && rec.subID == AppParams.USERID)
allRecordings.add(rec);
else if (rec.typeID != 1)
allRecordings.add(rec);
} }
myHandler.post(UpdateResultsRUN); myHandler.post(updateResultsRUN);
} }
// PlayRecording received from AppServer // playRecording received from AppServer
public void PlayRecording(long id) public void playRecording(long id) {
{
// change adapter image // change adapter image
} }
// Create runnable for posting // Create runnable for posting
final Runnable UpdateResultsRUN = new Runnable() { final Runnable updateResultsRUN = this::updateResultsInUi;
public void run() {
updateResultsInUi();
}
};
private void updateResultsInUi() private void updateResultsInUi() {
{
// clear played items // clear played items
playingPositions = new ArrayList<Boolean>(); playingPositions = new ArrayList<>();
for(int i=0; i<allRecordings.size(); i++) for (int i = 0; i < getAllRecordings().size(); i++)
playingPositions.add(true); playingPositions.add(true);
// set adapter - where playingPositions stores exists values // set adapter - where playingPositions stores exists values
adapter = new RecordingsGridViewAdapter(activity, context, allRecordings, playingPositions); adapter = new RecordingsGridViewAdapter(activity, getAllRecordings(), playingPositions);
// playing positions need to be false because no recording is played // playing positions need to be false because no recording is played
playingPositions.clear(); playingPositions.clear();
for(int i=0; i<allRecordings.size(); i++) for (int i = 0; i < getAllRecordings().size(); i++)
playingPositions.add(false); playingPositions.add(false);
updateNumberOfRecordings(); updateNumberOfRecordings();
@ -368,44 +304,78 @@ public class RecordingsActivity extends Activity {
} }
// send // send
private void GetRecordings(int radioGWID, int radioID) private void getRecordings(int radioGWID, int radioID) {
{ getParentTab().getRecordings(radioGWID, radioID);
parentTab.getRecordings(radioGWID, radioID);
} }
public void SendPlayRequest(long record_id) public void sendPlayRequest(long recordId) {
{ getParentTab().sendPlayRecordingRequest(recordId);
parentTab.sendPlayRecordingRequest(record_id);
} }
/**
/** Register for broadcasts */ * Register for broadcasts
*/
private void registerBroadcastIntents() { private void registerBroadcastIntents() {
IntentFilter intentFilter = new IntentFilter(OperationCodes.RECORDINGS_LIST_REP + ""); IntentFilter intentFilter = new IntentFilter(OperationCodes.RECORDINGS_LIST_REP + "");
this.registerReceiver(mReceiver, intentFilter); this.registerReceiver(mReceiver, intentFilter);
intentFilter = new IntentFilter(OperationCodes.RADIOID_CHANGED + ""); intentFilter = new IntentFilter(OperationCodes.RADIOID_CHANGED + "");
this.registerReceiver(mReceiver, intentFilter); this.registerReceiver(mReceiver, intentFilter);
} }
//The BroadcastReceiver that listens for Notification broadcasts //The BroadcastReceiver that listens for Notification broadcasts
public final BroadcastReceiver mReceiver = new BroadcastReceiver() { public final BroadcastReceiver mReceiver = new BroadcastReceiver() {
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
//SM.Debug("### NOTIFICATION ###", "Radio: " + intent.getAction());
final String action = intent.getAction(); final String action = intent.getAction();
// zone and/or channel changed // zone and/or channel changed
if (action.equals(OperationCodes.RECORDINGS_LIST_REP + "")) { if (action.equals(OperationCodes.RECORDINGS_LIST_REP + "")) {
UpdateRecordings(AppParams.recordings); updateRecordings(AppParams.recordings);
updateNumberOfRecordings(); updateNumberOfRecordings();
} } else if (action.equals(OperationCodes.RADIOID_CHANGED + "")) {
else if (action.equals(OperationCodes.RADIOID_CHANGED+"")) { textViewGateway.setText(getParentTab().getCrtRadio().IP);
textViewGateway.setText(parentTab.getCrtRadio().IP); getRecordings(getParentTab().getCrtRadio().GW_ID, getParentTab().getCrtRadio().ID);
GetRecordings(parentTab.getCrtRadio().GW_ID, parentTab.getCrtRadio().ID);
} }
} }
}; };
public TabLayoutActivity getParentTab() {
return parentTab;
} }
public void setParentTab(TabLayoutActivity parentTab) {
this.parentTab = parentTab;
}
public ArrayList<Recording> getAllRecordings() {
return allRecordings;
}
public void setAllRecordings(ArrayList<Recording> allRecordings) {
this.allRecordings = allRecordings;
}
public View getConvertViewRecording() {
return convertViewRecording;
}
public void setConvertViewRecording(View convertViewRecording) {
this.convertViewRecording = convertViewRecording;
}
public int getPlayingPosition() {
return playingPosition;
}
public void setPlayingPosition(int playingPosition) {
this.playingPosition = playingPosition;
}
public Bundle getSavedInstanceState() {
return savedInstanceState;
}
public void setSavedInstanceState(Bundle savedInstanceState) {
this.savedInstanceState = savedInstanceState;
}
}

106
safeDispatch/src/main/java/com/safemobile/safedispatch/TabLayoutActivity.java
View File

@ -14,13 +14,11 @@ import java.util.Timer;
import java.util.TimerTask; import java.util.TimerTask;
import com.google.android.gms.tasks.Task; import com.google.android.gms.tasks.Task;
import com.google.android.gms.tasks.TaskCompletionSource;
import com.safemobile.activities.AbstractEmptyActivity; import com.safemobile.activities.AbstractEmptyActivity;
import com.safemobile.activities.AbstractLiveActivity; import com.safemobile.activities.AbstractLiveActivity;
import com.safemobile.activities.AbstractMessagesActivity; import com.safemobile.activities.AbstractMessagesActivity;
import com.safemobile.activities.AbstractRadioActivity; import com.safemobile.activities.AbstractRadioActivity;
import com.safemobile.activities.AbstractSDParentActivity; import com.safemobile.activities.AbstractSDParentActivity;
import com.safemobile.safedispatch.R;
import com.safemobile.enums.AuthorizationCode; import com.safemobile.enums.AuthorizationCode;
import com.safemobile.enums.AuthorizationStatus; import com.safemobile.enums.AuthorizationStatus;
import com.safemobile.enums.ProviderSettingsStatus; import com.safemobile.enums.ProviderSettingsStatus;
@ -49,6 +47,7 @@ import com.safemobile.lib.SMSmsg;
import com.safemobile.lib.SerializedObject; import com.safemobile.lib.SerializedObject;
import com.safemobile.lib.SuperVehicle; import com.safemobile.lib.SuperVehicle;
import com.safemobile.lib.TCPmsg; import com.safemobile.lib.TCPmsg;
import com.safemobile.lib.User;
import com.safemobile.lib.VehMSG; import com.safemobile.lib.VehMSG;
import com.safemobile.lib.Vehicle; import com.safemobile.lib.Vehicle;
import com.safemobile.lib.radio.RadioGW; import com.safemobile.lib.radio.RadioGW;
@ -404,7 +403,7 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
} }
} }
SM.Debug("Logged user:" + AppParams.USERNAME + " | ID: " + AppParams.USERID); SM.Debug("Logged user:" + AppParams.USERNAME + " | id: " + AppParams.USERID);
// do not dim the display // do not dim the display
getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
@ -632,10 +631,10 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
tabHost.setCurrentTabByTag(RECORDINGS); tabHost.setCurrentTabByTag(RECORDINGS);
AppParams.crtTab = AppParams.Tabs.recordings; AppParams.crtTab = AppParams.Tabs.recordings;
if (AppParams.DEMO && getRecordingsActivity() != null && getRecordingsActivity().allRecordings != null && getRecordingsActivity().allRecordings.isEmpty()) { if (AppParams.DEMO && getRecordingsActivity() != null && getRecordingsActivity().getAllRecordings() != null && getRecordingsActivity().getAllRecordings().isEmpty()) {
ArrayList<Recording> listRecordings = new ArrayList<>(); ArrayList<Recording> listRecordings = new ArrayList<>();
Recording rec = new Recording(); Recording rec = new Recording();
rec.NameForDisplay = "Rob"; rec.userWhoWasCalled = "Rob";
rec.subID = 101; rec.subID = 101;
rec.endGMT = (int) Calendar.getInstance().getTime().getTime(); rec.endGMT = (int) Calendar.getInstance().getTime().getTime();
rec.startGMT = rec.endGMT - 2; rec.startGMT = rec.endGMT - 2;
@ -643,7 +642,7 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
listRecordings.add(rec); listRecordings.add(rec);
rec = new Recording(); rec = new Recording();
rec.NameForDisplay = "Call1 [Rob]"; rec.userWhoWasCalled = "Call1 [Rob]";
rec.subID = 102; rec.subID = 102;
rec.endGMT = (int) Calendar.getInstance().getTime().getTime(); rec.endGMT = (int) Calendar.getInstance().getTime().getTime();
rec.startGMT = rec.endGMT - 2; rec.startGMT = rec.endGMT - 2;
@ -651,13 +650,13 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
listRecordings.add(rec); listRecordings.add(rec);
rec = new Recording(); rec = new Recording();
rec.NameForDisplay = "Call2 [Rob]"; rec.userWhoWasCalled = "Call2 [Rob]";
rec.subID = 101; rec.subID = 101;
rec.endGMT = (int) Calendar.getInstance().getTime().getTime(); rec.endGMT = (int) Calendar.getInstance().getTime().getTime();
rec.startGMT = rec.endGMT - 3; rec.startGMT = rec.endGMT - 3;
listRecordings.add(rec); listRecordings.add(rec);
rec.type = 103; rec.type = 103;
getRecordingsActivity().UpdateRecordings(listRecordings); getRecordingsActivity().updateRecordings(listRecordings);
} }
} }
}); });
@ -1006,8 +1005,6 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
moribund.interrupt(); moribund.interrupt();
} }
this.unregisterReceiver(mReceiver);
// unbound from tcp service // unbound from tcp service
if (isBound) { if (isBound) {
getApplicationContext().unbindService(serviceConnection); getApplicationContext().unbindService(serviceConnection);
@ -1047,7 +1044,7 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
if (getMessageActivity() != null) if (getMessageActivity() != null)
getMessageActivity().onCreate(getMessageActivity().getSavedInstanceState()); getMessageActivity().onCreate(getMessageActivity().getSavedInstanceState());
if (getRecordingsActivity() != null) if (getRecordingsActivity() != null)
getRecordingsActivity().onCreate(getRecordingsActivity().savedInstanceState); getRecordingsActivity().onCreate(getRecordingsActivity().getSavedInstanceState());
if (getAlarmActivity() != null) if (getAlarmActivity() != null)
getAlarmActivity().onCreate(getAlarmActivity().getSavedInstanceState()); getAlarmActivity().onCreate(getAlarmActivity().getSavedInstanceState());
} }
@ -1361,7 +1358,7 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
SM.Debug("Got PlayRec :" + msg.allData); SM.Debug("Got PlayRec :" + msg.allData);
if (NO_SOUND) { if (NO_SOUND) {
SM.Debug("Recording Play file ID:" + msg.data); SM.Debug("Recording Play file id:" + msg.data);
//list for SMS //list for SMS
if (AppParams.crtTab == AppParams.Tabs.recordings) { if (AppParams.crtTab == AppParams.Tabs.recordings) {
@ -1370,7 +1367,7 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
try { try {
long id = Long.parseLong(tmp); long id = Long.parseLong(tmp);
if (getRecordingsActivity() != null) if (getRecordingsActivity() != null)
getRecordingsActivity().PlayRecording(id); getRecordingsActivity().playRecording(id);
} catch (Exception ex) { } catch (Exception ex) {
SM.Exception(ex.toString()); SM.Exception(ex.toString());
} }
@ -1578,7 +1575,7 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
if (radioMSG.incCall.callStatus == 3) { if (radioMSG.incCall.callStatus == 3) {
setInCall(false); setInCall(false);
// update recordings list // update recordings list
if (AppParams.crtTab == AppParams.Tabs.recordings && getRecordingsActivity() != null && getRecordingsActivity().playingPosition < 0) { if (AppParams.crtTab == AppParams.Tabs.recordings && getRecordingsActivity() != null && getRecordingsActivity().getPlayingPosition() < 0) {
// no recording is playing // no recording is playing
getRecordings(getCrtRadio().GW_ID, getCrtRadio().ID); getRecordings(getCrtRadio().GW_ID, getCrtRadio().ID);
} }
@ -1612,13 +1609,13 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
setAllRadios(radioMSG.RadioGWList); setAllRadios(radioMSG.RadioGWList);
if (getCrtRadio() == null) { if (getCrtRadio() == null) {
setCrtRadio(getAllRadios().get(0)); setCrtRadio(getAllRadios().get(0));
SM.Debug("radioMSG set 0 crtRadio GW_ID:" + getCrtRadio().GW_ID + " ID:" + getCrtRadio().ID + ")"); SM.Debug("radioMSG set 0 crtRadio GW_ID:" + getCrtRadio().GW_ID + " id:" + getCrtRadio().ID + ")");
notifyBroadcast(OperationCodes.RADIOID_CHANGED + ""); notifyBroadcast(OperationCodes.RADIOID_CHANGED + "");
} }
} }
// save crt Radio ID and GW // save crt Radio id and GW
if (radioMSG.zac != null) { if (radioMSG.zac != null) {
for (RadioGW radio : getAllRadios()) { for (RadioGW radio : getAllRadios()) {
if (radio.GW_ID == radioMSG.zac.gwID && radio.ID == radioMSG.zac.rgwID) if (radio.GW_ID == radioMSG.zac.gwID && radio.ID == radioMSG.zac.rgwID)
@ -1719,19 +1716,76 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
//list for SMS //list for SMS
if (AppParams.crtTab == AppParams.Tabs.recordings) { if (AppParams.crtTab == AppParams.Tabs.recordings) {
for (Recording rec : recordMSG.recordList) { for (Recording rec : recordMSG.getRecordList()) {
// set the name to be displayed
if (rec.typeID == 1)
rec.NameForDisplay = AppParams.USERNAME;
else {
SuperVehicle superVehicle = getSuperVehHash().get((long) rec.subID); SuperVehicle superVehicle = getSuperVehHash().get((long) rec.subID);
// set the name to be displayed
switch (rec.callType) {
case 0:
for (User u : AppParams.allUsers) {
if (u.id == rec.dispatcherId)
rec.userWhoCalled = u.login;
}
if (rec.userWhoCalled == null || rec.userWhoCalled.isEmpty())
rec.userWhoCalled = String.valueOf(rec.dispatcherId);
if (superVehicle != null) if (superVehicle != null)
rec.NameForDisplay = superVehicle.name; rec.userWhoWasCalled = superVehicle.name;
else
rec.userWhoWasCalled = String.valueOf(rec.subID);
break;
case 4:
rec.userWhoWasCalled = AppParams.USERNAME;
if (superVehicle != null)
rec.userWhoCalled = superVehicle.name;
else
rec.userWhoCalled = String.valueOf(rec.subID);
break;
case 1:
for (User u : AppParams.allUsers) {
if (u.id == rec.dispatcherId)
rec.userWhoCalled = u.login;
}
if (rec.userWhoCalled == null || rec.userWhoCalled.isEmpty())
rec.userWhoCalled = String.valueOf(rec.dispatcherId);
if (rec.groupName == null || rec.groupName.isEmpty())
rec.userWhoWasCalled = String.valueOf(rec.groupCpsId);
else
rec.userWhoWasCalled = rec.groupName;
break;
case 5:
if (superVehicle != null)
rec.userWhoCalled = superVehicle.name;
else
rec.userWhoCalled = String.valueOf(rec.subID);
if (rec.groupName == null || rec.groupName.isEmpty())
rec.userWhoWasCalled = String.valueOf(rec.groupCpsId);
else
rec.userWhoWasCalled = rec.groupName;
break;
case 2:
for (User u : AppParams.allUsers) {
if (u.id == rec.dispatcherId)
rec.userWhoCalled = u.login;
}
if (rec.userWhoCalled == null || rec.userWhoCalled.isEmpty())
rec.userWhoCalled = String.valueOf(rec.dispatcherId);
rec.userWhoWasCalled = "All Call";
break;
case 6:
rec.userWhoWasCalled = "All Call";
if (superVehicle != null)
rec.userWhoCalled = superVehicle.name;
else
rec.userWhoCalled = String.valueOf(rec.subID);
break;
} }
} }
// save recordings to AppParams // save recordings to AppParams
AppParams.recordings = recordMSG.recordList; AppParams.recordings = recordMSG.getRecordList();
// notify recordings were received // notify recordings were received
notifyBroadcast(OperationCodes.RECORDINGS_LIST_REP + ""); notifyBroadcast(OperationCodes.RECORDINGS_LIST_REP + "");
@ -2324,4 +2378,10 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
this.startActivity(intent); this.startActivity(intent);
} }
} }
@Override
protected void onDestroy() {
super.onDestroy();
this.unregisterReceiver(mReceiver);
}
} }