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

features/SD-211-recordings-tab #14

Merged
Bogdan merged 5 commits from features/SD-211-recordings-tab into develop 2022-03-30 11:26:25 +00:00
Conversation 0 Commits 5 Files Changed 13 +823 -1060
7 changed files with 823 additions and 1060 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8bb6f36e60 - Show all commits

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

@ -4,6 +4,7 @@
android:versionCode="1" android:versionCode="1"
android:versionName="1.0" > android:versionName="1.0" >
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<application <application
android:allowBackup="true" android:allowBackup="true"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"

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

@ -1,18 +1,9 @@
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.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;
@ -23,38 +14,39 @@ import com.safemobile.activities.AbstractRecordingsActivity;
import com.safemobile.lib.AppParams; 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; public class RecordingsGridViewAdapter extends BaseAdapter {
private int removePosition = -1; private final ArrayList<Recording> listRecordings;
//public String time; private final ArrayList<Boolean> recordingExists;
//private int[] colors = new int[] { Color.parseColor("#FFFFFF"), Color.parseColor("#D2E4FC") }; private final ArrayList<Boolean> playingPositions;
private Hashtable<Integer, View> hash = new Hashtable<Integer, View>(); private final Activity activity;
private final Context context;
public RecordingsGridViewAdapter(Activity activity, Context context, ArrayList<Recording> listRecordings, ArrayList<Boolean> recordingExists)
{ private final Hashtable<Integer, View> hash = new Hashtable<>();
public RecordingsGridViewAdapter(Activity activity, Context context, ArrayList<Recording> listRecordings, ArrayList<Boolean> recordingExists) {
super(); super();
this.activity = activity; this.activity = activity;
this.context = context; 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);
listRecordings.get(i).date = listRecordings.get(i).startGMT; listRecordings.get(i).date = listRecordings.get(i).startGMT;
listRecordings.get(i).duration = listRecordings.get(i).endGMT - listRecordings.get(i).startGMT; listRecordings.get(i).duration = listRecordings.get(i).endGMT - listRecordings.get(i).startGMT;
} }
} }
@Override @Override
public int getCount() { public int getCount() {
return listRecordings.size(); return listRecordings.size();
@ -70,185 +62,190 @@ 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((LinearLayout) convertView.findViewById(R.id.layoutRecording));
view.imageViewPlay = (ImageView) convertView.findViewById(R.id.imageViewPlay); view.setImageViewPlay((ImageView) convertView.findViewById(R.id.imageViewPlay));
view.textViewSender = (TextView) convertView.findViewById(R.id.textViewSender); view.setTextViewSender((TextView) convertView.findViewById(R.id.textViewSender));
view.textViewDuration = (TextView) convertView.findViewById(R.id.textViewDuration); view.setTextViewDuration((TextView) convertView.findViewById(R.id.textViewDuration));
view.textViewDate = (TextView) convertView.findViewById(R.id.textViewDate); view.setTextViewDate((TextView) convertView.findViewById(R.id.textViewDate));
view.imageViewRecycle = (ImageView) convertView.findViewById(R.id.imageViewRecycle); view.setImageViewRecycle((ImageView) 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).type);
switch(listRecordings.get(position).type) switch (listRecordings.get(position).type) {
{
case AppParams.AllCall: case AppParams.AllCall:
if(listRecordings.get(position).destinationRadioID == 0) if (listRecordings.get(position).destinationRadioID == 0)
view.imageViewPlay.setImageResource(R.drawable.call_received_all); view.getImageViewPlay().setImageResource(R.drawable.call_received_all);
else else
view.imageViewPlay.setImageResource(R.drawable.call_made_all); view.getImageViewPlay().setImageResource(R.drawable.call_made_all);
break; break;
case AppParams.PrivateCall: case AppParams.PrivateCall:
if(listRecordings.get(position).destinationRadioID == 0) if (listRecordings.get(position).destinationRadioID == 0)
view.imageViewPlay.setImageResource(R.drawable.call_received); view.getImageViewPlay().setImageResource(R.drawable.call_received);
else
view.imageViewPlay.setImageResource(R.drawable.call_made);
break;
case AppParams.GroupCall:
if(listRecordings.get(position).destinationRadioID == 0)
view.imageViewPlay.setImageResource(R.drawable.call_received_group);
else
view.imageViewPlay.setImageResource(R.drawable.call_made_group);
break;
}
/*
try
{
if(receivedPositions.get(position))
{
if(playingPositions.get(position))
view.imageViewPlay.setImageResource(R.drawable.play_received);
else else
view.imageViewPlay.setImageResource(R.drawable.call_received); view.getImageViewPlay().setImageResource(R.drawable.call_made);
break;
} case AppParams.GroupCall:
else if (listRecordings.get(position).destinationRadioID == 0)
{ view.getImageViewPlay().setImageResource(R.drawable.call_received_group);
if(playingPositions.get(position))
view.imageViewPlay.setImageResource(R.drawable.play_made);
else else
view.imageViewPlay.setImageResource(R.drawable.call_made); view.getImageViewPlay().setImageResource(R.drawable.call_made_group);
} break;
default:
view.getImageViewPlay().setImageResource(R.drawable.alert);
} }
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 // change the background for marked record
public void onClick(View v) { View view1 = hash.get(position);
// save the position of the marked record ViewHolder viewHolder = null;
removePosition = position; if (view1 != null) {
viewHolder = (ViewHolder) view1.getTag();
// change the background for marked record
View view = (View) hash.get(position);
ViewHolder viewHolder = (ViewHolder) view.getTag();
viewHolder.layoutRecording.setBackgroundColor(0xFF457c98);
((AbstractRecordingsActivity) activity).deleteSelected(position);
} }
if (viewHolder != null) {
viewHolder.getLayoutRecording().setBackgroundColor(0xFF457c98);
}
((AbstractRecordingsActivity) activity).deleteSelected(position);
}); });
// set recording image // set recording image
if(getItem(position).NameForDisplay.equals(AppParams.USERNAME)) if (getItem(position).NameForDisplay.equals(AppParams.USERNAME))
view.imageViewPlay.setImageDrawable(context.getResources().getDrawable(R.drawable.call_made_group)); view.getImageViewPlay().setImageDrawable(context.getResources().getDrawable(R.drawable.call_made_group));
else else
view.imageViewPlay.setImageDrawable(context.getResources().getDrawable(R.drawable.call_received_group)); view.getImageViewPlay().setImageDrawable(context.getResources().getDrawable(R.drawable.call_received_group));
view.textViewSender.setText(getItem(position).NameForDisplay); view.getTextViewSender().setText(getItem(position).NameForDisplay);
view.textViewDuration.setText("[" + getItem(position).duration + " sec]"); 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()))
simpleDateFormat = new SimpleDateFormat("HH:mm:ss");
if(date.after(calendar.getTime()))
sdf = 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);
// update hash View view = hash.get(position);
hash.get(position).setTag(viewHolder); // update hash
if (view != null)
view.setTag(viewHolder);
} }
} }

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

@ -1,11 +1,4 @@
package com.safemobile.services; package com.safemobile.services;
import java.io.*;
import java.net.*;
import java.nio.charset.Charset;
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;
@ -19,612 +12,434 @@ 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;
public String serverHostname = new String ("10.120.1.114");// public String serverHostname;
private int port = 13579; private int port;
private Thread listenThread; private Thread listenThread;
private Socket soc =null; private Socket soc = null;
//private BufferedReader recv;
//private PrintWriter writer;
private DataInputStream input; private DataInputStream input;
private DataOutputStream output; private DataOutputStream output;
private Timer timer;
private String leftOver = ""; private String leftOver = "";
public static LinkedList<TCPmsg> msgList; public static LinkedList<TCPmsg> msgList;
private volatile int n=0; private volatile int n = 0;
public Boolean isConnectionUP = false; public Boolean isConnectionUP = false;
public Boolean previousConnectionWasUP = false; public Boolean previousConnectionWasUP = false;
private Context context; private Context context;
private boolean isWiFiOn = true; private boolean isWiFiOn = true;
public TCPhandler(Context context, String hostName, int p) public TCPhandler(Context context, String hostName, int p) {
{
this.context = context; this.context = context;
serverHostname=hostName; serverHostname = hostName;
port=p; port = p;
msgList = new LinkedList<TCPmsg>(); msgList = new LinkedList<TCPmsg>();
SM.Debug("---TCPhandler constructor [" + hostName + "," + p + "] ---"); SM.Debug("---TCPhandler constructor [" + hostName + "," + p + "] ---");
listenThread = new Thread(this, "TCPlisten"); listenThread = new Thread(this, "TCPlisten");
listenThread.start(); // (2) Start the thread. listenThread.start(); // (2) Start the thread.
// create timer to check socket status // create timer to check socket status
timer = new Timer(); Timer timer = new Timer();
timer.scheduleAtFixedRate(new TimerTask() { timer.scheduleAtFixedRate(new TimerTask() {
@Override @Override
public void run() { public void run() {
try { try {
//Looper.prepare(); previousConnectionWasUP = isConnectionUP;
//mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
// get if is authenticated // try to send something
//Write("0.0", "d"); TCPmsgParser._fireonTCPConnectionStatusEvent(isConnectionUP, previousConnectionWasUP);
previousConnectionWasUP = isConnectionUP; } catch (Exception e) {
// try to send something
TCPmsgParser._fireonTCPConnectionStatusEvent(isConnectionUP, previousConnectionWasUP);
}
catch (Exception e) {
//e.printStackTrace();
SM.Exception("TIMERException", e.toString()); SM.Exception("TIMERException", e.toString());
} }
} }
}, 0, 3000); }, 0, 3000);
// get WiFi state // get WiFi state
ConnectivityManager connManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); ConnectivityManager connManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
NetworkInfo mWifi = connManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI); NetworkInfo mWifi = connManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
if(mWifi.isConnectedOrConnecting()) if (mWifi.isConnectedOrConnecting())
isWiFiOn = true; isWiFiOn = true;
IntentFilter intentFilter = new IntentFilter(); IntentFilter intentFilter = new IntentFilter();
intentFilter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION); intentFilter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);
context.registerReceiver(mReceived, intentFilter); context.registerReceiver(mReceived, intentFilter);
} }
@Override @Override
public void run() public void run() {
{ try {
try if (soc != null)
{ soc.close();
if(soc!=null)
soc.close(); soc = new Socket();
soc.connect(new InetSocketAddress(serverHostname, port), 5000);
soc = new Socket();
soc.connect(new InetSocketAddress(serverHostname, port), 5000); input = new DataInputStream(soc.getInputStream());
output = new DataOutputStream(soc.getOutputStream());
//soc.setSoTimeout(3000);
//SM.Debug("Socket timeout:" + soc.getSoTimeout() ); if (soc != null) {
//soc.setSoTimeout(5000); isConnectionUP = true;
triggerTCPConnectionStateEvent();
input = new DataInputStream(soc.getInputStream());
output = new DataOutputStream(soc.getOutputStream());
//recv= new BufferedReader(new InputStreamReader(soc.getInputStream()));
//writer =new PrintWriter(soc.getOutputStream()) ;
if(soc !=null) {
//previousConnectionWasUP = isConnectionUP;
isConnectionUP = true;
triggerTCPConnectionStateEvent();
}
}
catch (UnknownHostException e)
{
SM.Debug("UnknownHostException", "TCPhandler break:"+e.toString());
}
catch (IllegalArgumentException e)
{
SM.Debug("IllegalArgumentException", "TCPhandler break:"+e.toString());
}
catch (IOException e)
{
SM.Debug("IOException", "TCPhandler break:"+e.toString());
} }
while(alive) } catch (UnknownHostException e) {
{ SM.Debug("UnknownHostException", "TCPhandler break:" + e.toString());
//SM.Debug("Waiting for data..."); } catch (IllegalArgumentException e) {
SM.Debug("IllegalArgumentException", "TCPhandler break:" + e.toString());
} catch (IOException e) {
SM.Debug("IOException", "TCPhandler break:" + e.toString());
}
while (alive) {
try { try {
Thread.sleep(3000); Thread.sleep(3000);
} catch (InterruptedException e) { } catch (InterruptedException e) {
SM.Debug("TCPhandler Crash1 on sleep:"+e.toString()); SM.Debug("TCPhandler Crash1 on sleep:" + e.toString());
} }
while(isConnectionUP) while (Boolean.TRUE.equals(isConnectionUP)) {
{ try {
try Thread.sleep(100);
{ //process leftover
Thread.sleep(100); try {
//SM.Debug("Waiting for data..."); boolean FinishLeftOver = true;
//process leftover while (FinishLeftOver) {
try String[] tempArr2 = leftOver.split("#");
{ if (tempArr2.length > 1) {
boolean FinishLeftOver =true; int messLen;
while (FinishLeftOver) try {
{ messLen = Integer.parseInt(tempArr2[1]);
// add this replacement if message length doesn't contain the last # } catch (Exception e) {
// leftOver = leftOver.replace("##", "#"); SM.Debug("leftovers", "incorect msg len leftOver =" + tempArr2[1]);
String[] tempArr2 = leftOver.split("#"); messLen = -1;
if (tempArr2.length > 1) }
{
int messLen; if (messLen > leftOver.length()) {
try FinishLeftOver = false;
{ break;
messLen = Integer.parseInt(tempArr2[1]); } else if (messLen == leftOver.length()) {
TCPmsg msg = new TCPmsg(leftOver.toCharArray());
//TODO talk to Gaby to fix this on Bridge SM.Debug("leftovers", "RX from leftOver:" + msg.allData);
} if (msg.allData.contains("#92#"))
catch (Exception e) prioritizePongReceived();
{
SM.Debug("leftovers", "incorect msg len leftOver =" + tempArr2[1]); msgList.add(msg);
messLen =-1; leftOver = "";
} FinishLeftOver = false;
break;
if(messLen>leftOver.length()) } else // we have more message in leftover
{ {
FinishLeftOver =false; TCPmsg msg = new TCPmsg(leftOver.substring(0, messLen).toCharArray());
break; SM.Debug("leftovers", "RX from leftOver:" + msg.allData);
}
else if(messLen==leftOver.length()) if (msg.allData.contains("#92#"))
{ prioritizePongReceived();
TCPmsg msg = new TCPmsg(leftOver.toCharArray());
SM.Debug("leftovers", "RX from leftOver:"+msg.allData); msgList.add(msg);
leftOver = leftOver.substring(messLen, leftOver.length());
if(msg.allData.contains("#92#")) }
prioritizePongReceived(); } else FinishLeftOver = false;
}
msgList.add(msg); } catch (Exception e) {
leftOver =""; SM.Debug("leftovers", "Error on process leftover" + e.toString());
FinishLeftOver =false; }
break;
}
else // we have more message in leftover
{
TCPmsg msg = new TCPmsg(leftOver.substring(0,messLen).toCharArray());
SM.Debug("leftovers", "RX from leftOver:"+msg.allData);
if(msg.allData.contains("#92#"))
prioritizePongReceived();
msgList.add(msg);
leftOver = leftOver.substring(messLen,leftOver.length());
}
}
else FinishLeftOver = false;
}
}
catch (Exception e)
{
SM.Debug("leftovers", "Error on process leftover"+e.toString());
}
//end process leftover //end process leftover
String data =""; String data = "";
n=0; n = 0;
//char[] buf = new char[1024];
//n = recv.read(buf);
byte[] buf = new byte[1024]; byte[] buf = new byte[1024];
// read data into buffer // read data into buffer
n = input.read(buf); n = input.read(buf);
//connection closed by server //connection closed by server
if(n==-1) if (n == -1) {
{
SM.Debug("TCP Client", "Connection closed by server!"); SM.Debug("TCP Client", "Connection closed by server!");
soc.close(); soc.close();
//previousConnectionWasUP = isConnectionUP;
isConnectionUP = false; isConnectionUP = false;
triggerTCPConnectionStateEvent(); triggerTCPConnectionStateEvent();
soc = null; soc = null;
break; break;
} }
byte[] temp = new byte[n];
for(int i=0;i<n;i++) temp[i] = buf[i];
//String data =new String(temp);
// decryptData
temp = decryptTEA(temp);
data = new String(temp);
//if we have any leftovers from previous message add them
if(leftOver.length()>1) // avoid case with only one # byte[] temp = new byte[n];
{ if (n >= 0) System.arraycopy(buf, 0, temp, 0, n);
data = leftOver+data;
leftOver = ""; // decryptData
} temp = decryptTEA(temp);
//search for overflow message data = new String(temp);
String[] tempArr = data.split("#");
if ((tempArr.length == 0) || (tempArr.length == 1)) //if we have any leftovers from previous message add them
{ if (leftOver.length() > 1) // avoid case with only one #
SM.Debug("TCP Client", "incorect messagebuss message=" + data); {
continue; data = leftOver + data;
} leftOver = "";
//get msg len }
// for(int i=0;i<tempArr.length;i++)
// SM.Debug("I:"+i+" tempArr[i]:"+tempArr[i]); //search for overflow message
int messLen; String[] tempArr = data.split("#");
if ((tempArr.length == 0) || (tempArr.length == 1)) {
SM.Debug("TCP Client", "incorect messagebuss message=" + data);
continue;
}
//get msg len
int messLen;
try { try {
messLen = Integer.parseInt(tempArr[1]); messLen = Integer.parseInt(tempArr[1]);
} catch (Exception e) { } catch (Exception e) {
SM.Debug("TCP Client", "incorect msg len =" + tempArr[1]); SM.Debug("TCP Client", "incorect msg len =" + tempArr[1]);
continue; continue;
} }
//messLen not int //messLen not int
if(messLen == -1) if (messLen == -1) {
{ continue;
//SM.Debug("messLen not int=" + messLen +" tempArr[1]:" +tempArr[1]); }
continue; char[] temMSG = data.toCharArray();
} if (data.length() != messLen) {
char[] temMSG = data.toCharArray(); if (messLen > data.length()) {
//SM.Debug("MessLen:"+messLen+" Data len:"+data.length()+"IF:"+(data.length() != messLen)); leftOver = data; // Add by bigu
if (data.length() != messLen) continue;
{ }
//if expected string message is smaller then actual string then exit processing; //perform cut
if(messLen>data.length()) temMSG = data.substring(0, messLen).toCharArray();
//if(messLen>n) leftOver = data.substring(messLen, data.length());
{ }
//SM.Debug("duda","messLen=" + messLen +" data.length():" +data.length()+"n:"+n);
leftOver = data; // Add by bigu
continue;
}
//perform cut
//SM.Debug("We got leftover ....message length("+messLen+") != actual length("+data.length()+")");
temMSG = data.substring(0,messLen).toCharArray();
//SM.Debug("temMSG:"+temMSG.toString());
leftOver = data.substring(messLen,data.length());
//SM.Debug("leftOver:"+leftOver);
//leftOver = data.substring(messLen,n);
//SM.Debug("left over string:"+leftOver);
}
//decode TCP msg //decode TCP msg
TCPmsg msg = new TCPmsg(temMSG); TCPmsg msg = new TCPmsg(temMSG);
SM.Debug("<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> RX <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", msg.allData); SM.Debug("<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> RX <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", msg.allData);
if(msg.allData.contains("#92#")) if (msg.allData.contains("#92#"))
prioritizePongReceived(); prioritizePongReceived();
msgList.add(msg); msgList.add(msg);
} } catch (Exception ex) {
catch(Exception ex) SM.Debug("TCPHandler", "TCPhandler/run/break:" + ex.toString());
{
SM.Debug("TCPHandler", "TCPhandler/run/break:"+ex.toString());
//previousConnectionWasUP = isConnectionUP;
isConnectionUP = false; isConnectionUP = false;
triggerTCPConnectionStateEvent(); triggerTCPConnectionStateEvent();
} }
}//while(connOK) }
// //
try { try {
Thread.sleep(1000); Thread.sleep(1000);
} catch (InterruptedException e) { } catch (InterruptedException e) {
SM.Debug("TCPhandler Crash2 on sleep:"+e.toString()); SM.Debug("TCPhandler Crash2 on sleep:" + e.toString());
//previousConnectionWasUP = isConnectionUP;
} }
//try to restart connection //try to restart connection
if(alive && isWiFiOn) if (alive && isWiFiOn)
RestartTCP(); restartTCP();
}//while(alive) }
SM.Debug("=================================="); SM.Debug("==================================");
SM.Debug("TCP listenThread stoped!! alive = false"); SM.Debug("TCP listenThread stoped!! alive = false");
SM.Debug("=================================="); SM.Debug("==================================");
} }
/** /**
* Create a bypass in order to trigger the ping received event * Create a bypass in order to trigger the ping received event
*/ */
private void prioritizePongReceived() { private void prioritizePongReceived() {
TCPmsgParser._firePONGReceivedEvent(); TCPmsgParser._firePONGReceivedEvent();
} }
/* Broadcast Received for WiFi Connect/Disconnect */ /* Broadcast Received for WiFi Connect/Disconnect */
public BroadcastReceiver mReceived = new BroadcastReceiver() { public BroadcastReceiver mReceived = new BroadcastReceiver() {
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
final String action = intent.getAction(); final String action = intent.getAction();
SM.Debug("WIFI STATE", action); SM.Debug("WIFI STATE", action);
if(action.equals(WifiManager.NETWORK_STATE_CHANGED_ACTION)){ if (action.equals(WifiManager.NETWORK_STATE_CHANGED_ACTION)) {
NetworkInfo info = intent.getParcelableExtra(WifiManager.EXTRA_NETWORK_INFO); NetworkInfo info = intent.getParcelableExtra(WifiManager.EXTRA_NETWORK_INFO);
// close socket if the wifi is disconnecting or disconnected // close socket if the wifi is disconnecting or disconnected
if(!info.isConnectedOrConnecting()) { if (!info.isConnectedOrConnecting()) {
closeSocket(); closeSocket();
isWiFiOn = false; isWiFiOn = false;
} } else
else isWiFiOn = true;
isWiFiOn = true; }
}
} }
}; };
/**
/** Send a message through the TCP Socket * Send a message through the TCP Socket
*
* @param seqID The messages's sequence ID (a number of order) * @param seqID The messages's sequence ID (a number of order)
* @param msg The messages which will be sent * @param msg The messages which will be sent
* @return True if the message was sent * @return True if the message was sent
*/ */
public boolean Write(String seqID, String msg) public boolean Write(String seqID, String msg) {
{ try {
if (output != null) {
try
{
/*
if(writer != null)
{
String cmdok = "#" + seqID + msg;
Integer tmp = cmdok.length() + 1;
//SM.Debug("tmp:"+tmp);
tmp += Integer.toString(tmp).length();// tmp.ToString().Length;
if((tmp==10)||(tmp==100)||(tmp==1000)) tmp++;
cmdok = "#" + Integer.toString(tmp) + cmdok;
writer.write(encryptTEA(cmdok));
writer.flush();
SM.Debug("TX:"+encryptTEA(cmdok));
return true;
}*/
if(output != null)
{
try { try {
Thread.sleep(10); Thread.sleep(10);
String cmdok = "#" + seqID + msg; String cmdok = "#" + seqID + msg;
Integer tmp = cmdok.length() + 1; Integer tmp = cmdok.length() + 1;
//SM.Debug("tmp:"+tmp);
tmp += Integer.toString(tmp).length();// tmp.ToString().Length; tmp += Integer.toString(tmp).length();
if((tmp==10)||(tmp==100)||(tmp==1000)) tmp++; if ((tmp == 10) || (tmp == 100) || (tmp == 1000)) tmp++;
cmdok = "#" + Integer.toString(tmp) + cmdok; cmdok = "#" + Integer.toString(tmp) + cmdok;
byte[] mess = encryptTEA(cmdok); byte[] mess = encryptTEA(cmdok);
Thread gfgThread = new Thread(() -> {
try {
output.write(mess); output.write(mess);
output.flush(); output.flush();
} catch (Exception e) {
// show only notACK messages e.printStackTrace();
//if(mess[3] != 0x0C) }
});
gfgThread.start();
SM.Debug(" ", new String(mess)); SM.Debug(" ", new String(mess));
return true; return true;
//} catch (IOException e) {
// SM.Exception("TCPClient[Send]", e.toString());
} catch (InterruptedException e) {
SM.Exception("TCPClient[Send]", e.toString());
} catch (NoSuchElementException e) {
SM.Exception("TCPClient[Send]", e.toString());
} }
catch (IOException e) { } else {
//e.printStackTrace();
SM.Exception("TCPClient[Send]", e.toString());
} catch (InterruptedException e) {
SM.Exception("TCPClient[Send]", e.toString());
} catch (NoSuchElementException e) {
SM.Exception("TCPClient[Send]", e.toString());
}
}
else
{
return false; return false;
} }
} } catch (Exception e) {
catch (Exception e) SM.Debug("TCPhandler Write Procedure:" + e.toString());
{
SM.Debug("TCPhandler Write Procedure:"+e.toString());
} }
return false; return false;
} }
public void setConnectionIsDown() { public void setConnectionIsDown() {
if(input != null) { if (input != null) {
try { try {
input.close(); input.close();
} catch (IOException e) { } catch (IOException e) {
} } finally {
finally {
input = null; input = null;
} }
} }
isConnectionUP = false; isConnectionUP = false;
} }
/* Encrypt a string using an encryption algorithm, /* Encrypt a string using an encryption algorithm,
* in this case TEA */ * in this case TEA */
public static byte[] encryptTEA(String toEncryptData) { public static byte[] encryptTEA(String toEncryptData) {
byte[] encryptedByteArray = new byte[]{}; byte[] encryptedByteArray = new byte[]{};
/*
//encrypt message using TEA
try {
encryptedByteArray = TEA.encrypt(toEncryptData);
} catch (UnsupportedEncodingException e) {
SM.Exception("encryptTEA Exception(UEE): " + e.toString());
} catch (IndexOutOfBoundsException e) {
SM.Exception("encryptTEA Exception(IOoBE): " + e.toString());
} catch (NullPointerException e) {
SM.Exception("encryptTEA Exception(NPE): " + e.toString());
}
//*/
// no encryption // no encryption
encryptedByteArray = toEncryptData.getBytes(); encryptedByteArray = toEncryptData.getBytes();
return encryptedByteArray; return encryptedByteArray;
} }
/* Decrypt a string using an encryption algorithm, /* Decrypt a string using an encryption algorithm,
* in this case TEA */ * in this case TEA */
public static byte[] decryptTEA(byte[] toDecryptData) { public static byte[] decryptTEA(byte[] toDecryptData) {
byte[] decryptedByteArray = new byte[]{}; byte[] decryptedByteArray = new byte[]{};
/*
String sm = "";
for(int i=0; i<toDecryptData.length; i++)
sm+=toDecryptData[i] + " ";
SM.Debug("DDDDDD: " + sm);
//*/
/*
//decrypt message using TEA
try {
decryptedByteArray = TEA.decrypt(toDecryptData);
} catch (UnsupportedEncodingException e) {
SM.Exception("encryptTEA Exception(UEE): " + e.toString());
} catch (IndexOutOfBoundsException e) {
SM.Exception("encryptTEA Exception(IOoBE): " + e.toString());
} catch (NullPointerException e) {
SM.Exception("encryptTEA Exception(NPE): " + e.toString());
}
String sm = "";
for(int i=0; i<decryptedByteArray.length; i++)
sm+= (int)decryptedByteArray[i] + " ";
//sm = new String(decryptedByteArray.toString());
try {
SM.Debug("##### " + new String(decryptedByteArray, "UTF-8"));
} catch (UnsupportedEncodingException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
SM.Debug("DEcrypted: " + decryptedByteArray.toString());
//*/
// no decryption // no decryption
decryptedByteArray = toDecryptData; decryptedByteArray = toDecryptData;
return decryptedByteArray; return decryptedByteArray;
} }
public int getPort() { public int getPort() {
return port; return port;
} }
public void updateTCPparameters(String ip, String _port) public void updateTCPparameters(String ip, String _port) {
{
// stop socket // stop socket
try { try {
if(soc != null) if (soc != null)
soc.close(); soc.close();
} catch (IOException e1) { } catch (IOException e1) {
e1.printStackTrace(); e1.printStackTrace();
} }
serverHostname = ip; serverHostname = ip;
try try {
{
port = Integer.parseInt(_port); port = Integer.parseInt(_port);
} } catch (Exception e) {
catch (Exception e) {
} finally {
}
finally
{
port = 13589; port = 13589;
} }
} }
public void triggerTCPConnectionStateEvent() { public void triggerTCPConnectionStateEvent() {
if(!isConnectionUP) if (!isConnectionUP)
TCPmsgParser._fireTCPConnectionDownEvent(previousConnectionWasUP); TCPmsgParser._fireTCPConnectionDownEvent(previousConnectionWasUP);
else else
TCPmsgParser._fireTCPConnectionUpEvent(previousConnectionWasUP); TCPmsgParser._fireTCPConnectionUpEvent(previousConnectionWasUP);
} }
private void RestartTCP() private void restartTCP() {
{ try {
try
{
isConnectionUP = false; isConnectionUP = false;
previousConnectionWasUP = false; previousConnectionWasUP = false;
SM.Debug("Restarting TCP...ip:"+serverHostname + ":" + port); SM.Debug("Restarting TCP...ip:" + serverHostname + ":" + port);
soc = new Socket(); soc = new Socket();
soc.connect(new InetSocketAddress(serverHostname, port), 5000); soc.connect(new InetSocketAddress(serverHostname, port), 5000);
input = new DataInputStream(soc.getInputStream()); input = new DataInputStream(soc.getInputStream());
//input = new BufferedReader(new InputStreamReader(socket.getInputStream()));
//output stream //output stream
output = new DataOutputStream(soc.getOutputStream()); output = new DataOutputStream(soc.getOutputStream());
//recv= new BufferedReader(new InputStreamReader(soc.getInputStream())); if (soc != null) {
//writer =new PrintWriter(soc.getOutputStream()) ;
if(soc !=null)
{
//previousConnectionWasUP = isConnectionUP;
isConnectionUP = true; isConnectionUP = true;
//triggerTCPConnectionStateEvent();
/*
//init connection
boolean res = Write("0.0", "#19#" + AppParams.crtRadio.ip + "&"
+ AppParams.crtRadio.id + "#");
if(res){
SM.Debug("Message (AirPadInit) sent to controller");
}else{
SM.Debug("Could not send message(AirPadInit)!!");
}
//get
res = Write("0.0", "#30#104#0#0#0#0#");
if(res){
SM.Debug("Message (GetSetZoneAndChannel) sent to app server zoneNR:"+0+ " channelNR:"+0);
}else{
SM.Debug("Could not send message(GetSetZoneAndChannel)!!!");
}
*/
//init audio
//AudioHandle.b_SendinitUDP = true;
} }
} } catch (UnknownHostException e) {
catch (UnknownHostException e) SM.Exception("restartTCP break:" + e.toString());
{
SM.Exception("RestartTCP break:"+e.toString());
isConnectionUP = false; isConnectionUP = false;
} catch (IllegalArgumentException e) {
} SM.Debug("IllegalArgumentException", "restartTCP break:" + e.toString());
catch (IllegalArgumentException e) } catch (IOException e) {
{ SM.Exception("restartTCP break:" + e.toString());
SM.Debug("IllegalArgumentException", "RestartTCP break:"+e.toString()); isConnectionUP = false;
} } catch (NullPointerException e) {
catch (IOException e) SM.Exception("restartTCP break:" + e.toString());
{
SM.Exception("RestartTCP break:"+e.toString());
isConnectionUP = false; isConnectionUP = false;
} }
catch (NullPointerException e)
{
SM.Exception("RestartTCP break:"+e.toString());
isConnectionUP = false;
}
triggerTCPConnectionStateEvent(); triggerTCPConnectionStateEvent();
} }
@ -635,42 +450,43 @@ public class TCPhandler implements Runnable
public void setAlive(boolean alive) { public void setAlive(boolean alive) {
this.alive = alive; this.alive = alive;
} }
/** close Socket when unReachable */ /**
* close Socket when unReachable
*/
public void closeSocket() { public void closeSocket() {
try { try {
input = null; input = null;
output = null; output = null;
if(soc!=null) if (soc != null)
soc.close(); soc.close();
soc = null; soc = null;
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
public void Stop() {
public void Stop()
{
SM.Debug("Stopping TCP", "TCP Connection is stopping on " + AppParams.IP + ":" + port); SM.Debug("Stopping TCP", "TCP Connection is stopping on " + AppParams.IP + ":" + port);
alive = false; alive = false;
if(mReceived!= null) if (mReceived != null)
try{ context.unregisterReceiver(mReceived); } catch(Exception ex) {/* receiver not registered //*/}; try {
context.unregisterReceiver(mReceived);
} catch (Exception ex) {/* receiver not registered //*/}
;
// stop thread // stop thread
if(listenThread != null) if (listenThread != null) {
{
Thread moribund = listenThread; Thread moribund = listenThread;
listenThread = null; listenThread = null;
moribund.interrupt(); moribund.interrupt();
} }
if(input!=null) if (input != null) {
{
try { try {
input.close(); input.close();
input = null; input = null;
@ -678,9 +494,8 @@ public class TCPhandler implements Runnable
e.printStackTrace(); e.printStackTrace();
} }
} }
if(output!=null) if (output != null) {
{
try { try {
output.close(); output.close();
output = null; output = null;
@ -688,15 +503,13 @@ public class TCPhandler implements Runnable
e.printStackTrace(); e.printStackTrace();
} }
} }
if(soc !=null) if (soc != null) {
{
try { try {
soc.close(); soc.close();
soc = null; soc = null;
} } catch (IOException e) {
catch (IOException e) { SM.Exception("TCPClient[STOP]", "Stop break:" + e.toString());
SM.Exception("TCPClient[STOP]", "Stop break:"+e.toString());
} }
} }
} }

103
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; public RecordingHandle(String ip) {
private TCPaudioClient tcp;
private int recport = 50002;
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 -> {
{ byte[] data = event.data();
int len = event.len();
@Override SM.Debug("received b:" + len + " data.length:" + data.length);
public void dataRecv(TCPaudioEvent event) { playSound(data);
byte[] data = event.data();
int len = event.len();
SM.Debug("recv b:"+len+" data.length:"+data.length);
if(data!=null)
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) {
{ playDev.write(data, 0, data.length);
if(playDev.getState() == playDev.STATE_INITIALIZED)
{
playDev.write(data, 0 , data.length);
playDev.play(); playDev.play();
} else {
}
else
{
SM.Debug("Cannot play sound playDev NOT init corectly"); 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;
}
}

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;

637
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,376 +33,352 @@ 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
private RecordingHandle recHandle = null;
/* Dialog */
private TextView textViewCount, textViewGateway;
public Bundle savedInstanceState;
/** Called when the activity is first created. */
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
this.savedInstanceState = savedInstanceState;
// get parentTab
parentTab = (TabLayoutActivity)getParent();
Locale locale = new Locale(AppParams.LANGUAGETMP);
Locale.setDefault(locale);
Configuration config = new Configuration();
config.locale = locale;
getBaseContext().getResources().updateConfiguration(config,
getBaseContext().getResources().getDisplayMetrics());
setContentView(R.layout.tabrecordings);
//recoding TCP and audio
// get context private RecordingHandle recHandle = null;
context = this;
activity = this;
// change tab header fontface
TextView textView1 = (TextView) findViewById(R.id.textViewTitle);
textView1.setTypeface(Typeface.createFromAsset(getAssets(), "Sketch_Block.ttf"));
textView1.setTextSize(24);
gridView = (GridView) findViewById(R.id.gridViewRecordings);
adapter = new RecordingsGridViewAdapter(activity, context, allRecordings, playingPositions);
gridView.setAdapter(adapter);
gridView.setOnItemClickListener(onItemClickListener);
if(recHandle == null && !AppParams.DEMO)
recHandle = new RecordingHandle(AppParams.IP);
textViewCount = (TextView) findViewById(R.id.textViewCount);
updateNumberOfRecordings();
textViewGateway = (TextView) findViewById(R.id.textViewGateway);
textViewGateway.setTypeface(Typeface.createFromAsset(getAssets(), "Sketch_Block.ttf"));
textViewGateway.setTextSize(24);
textViewGateway.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
allGWsIP.clear();
for(RadioGW radio: AppParams.listRadios)
allGWsIP.add(radio.IP);
ArrayAdapter<String> adapter = new ArrayAdapter<String>(context, R.layout.template_simple_list_item,
allGWsIP);
AlertDialog.Builder builder = new AlertDialog.Builder( /* Dialog */
context); private TextView textViewCount;
builder.setTitle("Select RadioGW"); private TextView textViewGateway;
builder.setAdapter(adapter,
new DialogInterface.OnClickListener() { private Bundle savedInstanceState;
@Override
public void onClick(DialogInterface dialog, int which) { /**
// change gateway * Called when the activity is first created.
textViewGateway.setText(allGWsIP.get(which)); */
Toast.makeText(context, getString(R.string.loadingRecordings), Toast.LENGTH_SHORT).show(); @Override
GetRecordings(parentTab.getAllRadios().get(which).GW_ID, parentTab.getAllRadios().get(which).ID); public void onCreate(Bundle savedInstanceState) {
} super.onCreate(savedInstanceState);
}); this.setSavedInstanceState(savedInstanceState);
AlertDialog alert = builder.create(); setParentTab((TabLayoutActivity) getParent());
alert.show();
} Locale locale = new Locale(AppParams.LANGUAGETMP);
Locale.setDefault(locale);
Configuration config = new Configuration();
config.locale = locale;
getBaseContext().getResources().updateConfiguration(config, getBaseContext().getResources().getDisplayMetrics());
setContentView(R.layout.tabrecordings);
// get context
context = this;
activity = this;
// change tab header fontFace
TextView textView1 = (TextView) findViewById(R.id.textViewTitle);
textView1.setTypeface(Typeface.createFromAsset(getAssets(), "Sketch_Block.ttf"));
textView1.setTextSize(24);
gridView = (GridView) findViewById(R.id.gridViewRecordings);
adapter = new RecordingsGridViewAdapter(activity, context, getAllRecordings(), playingPositions);
gridView.setAdapter(adapter);
gridView.setOnItemClickListener(onItemClickListener);
if (recHandle == null && !AppParams.DEMO)
recHandle = new RecordingHandle(AppParams.IP);
textViewCount = (TextView) findViewById(R.id.textViewCount);
updateNumberOfRecordings();
textViewGateway = (TextView) findViewById(R.id.textViewGateway);
textViewGateway.setTypeface(Typeface.createFromAsset(getAssets(), "Sketch_Block.ttf"));
textViewGateway.setTextSize(24);
textViewGateway.setOnClickListener(v -> {
allGWsIP.clear();
for (RadioGW radio : AppParams.listRadios)
allGWsIP.add(radio.IP);
ArrayAdapter<String> adapter = new ArrayAdapter<>(context, R.layout.template_simple_list_item,
allGWsIP);
AlertDialog.Builder builder = new AlertDialog.Builder(
context);
builder.setTitle("Select RadioGW");
builder.setAdapter(adapter,
(dialog, which) -> {
// change gateway
textViewGateway.setText(allGWsIP.get(which));
Toast.makeText(context, getString(R.string.loadingRecordings), Toast.LENGTH_SHORT).show();
getRecordings(getParentTab().getAllRadios().get(which).GW_ID, getParentTab().getAllRadios().get(which).ID);
});
AlertDialog alert = builder.create();
alert.show();
}); });
textViewGateway.setVisibility(View.INVISIBLE); textViewGateway.setVisibility(View.INVISIBLE);
parentTab.setRecordingsActivity(this);
// register to receive broadcasts
registerBroadcastIntents();
}
@Override
public void onBackPressed()
{
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setMessage(getString(R.string.exit))
.setCancelable(false)
.setNeutralButton(getString(R.string.logout), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
parentTab.whenBackPressed(AppParams.ActivityResult.logout);
}
})
.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();
alert.show();
}
/** Update the number of recordings displayed on the top layout */
private void updateNumberOfRecordings() {
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); getParentTab().setRecordingsActivity(this);
ImageView image = dialog.findViewById(R.id.image);
// register to receive broadcasts
image.setImageResource(R.mipmap.ic_launcher); registerBroadcastIntents();
text.setText(errorMsg);
dialog.show();
} }
@Override
@Override public void onBackPressed() {
public void onPause() AlertDialog.Builder builder = new AlertDialog.Builder(this);
{ builder.setMessage(getString(R.string.exit))
super.onPause(); .setCancelable(false)
SM.Debug("onPause"); .setNeutralButton(getString(R.string.logout), (dialog, id) -> getParentTab().whenBackPressed(AppParams.ActivityResult.logout))
} .setPositiveButton(getString(R.string.ext), (dialog, id) -> getParentTab().whenBackPressed(AppParams.ActivityResult.exit))
.setNegativeButton(getString(R.string.cancel), (dialog, id) -> dialog.cancel());
@Override AlertDialog alert = builder.create();
public void onResume() alert.show();
{ }
super.onResume();
if(parentTab.getTCPState() != null && !AppParams.DEMO){ /**
* Update the number of recordings displayed on the top layout
Toast.makeText(context, getString(R.string.moreRecordings), Toast.LENGTH_SHORT).show(); */
private void updateNumberOfRecordings() {
if(parentTab.getCrtRadio() != null) textViewCount.setText("[" + AppParams.recordings.size() + "]");
textViewGateway.setText(parentTab.getCrtRadio().IP); }
/* @Override
if(parentTab.allRadios == null) public void onPause() {
GetGWRadios(); super.onPause();
*/ SM.Debug("onPause");
if(playingPosition < 0 && parentTab.getCrtRadio() != null) }
{
SM.Debug("GetRecordings resume + crtRadio:"+ parentTab.getCrtRadio().toString()); @Override
GetRecordings(parentTab.getCrtRadio().GW_ID, parentTab.getCrtRadio().ID); public void onResume() {
} super.onResume();
if (getParentTab().getTCPState() != null && !AppParams.DEMO) {
}
SM.Debug("onResume"); Toast.makeText(context, getString(R.string.moreRecordings), Toast.LENGTH_SHORT).show();
}
if (getParentTab().getCrtRadio() != null)
private OnItemClickListener onItemClickListener = new OnItemClickListener() { textViewGateway.setText(getParentTab().getCrtRadio().IP);
if (getPlayingPosition() < 0 && getParentTab().getCrtRadio() != null) {
SM.Debug("getRecordings resume + crtRadio:" + getParentTab().getCrtRadio().toString());
getRecordings(getParentTab().getCrtRadio().GW_ID, getParentTab().getCrtRadio().ID);
}
}
SM.Debug("onResume");
}
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;
try {
switch(position)
{
case 1: afd = getAssets().openFd("startwindows.mp3"); break;
case 2: afd = getAssets().openFd("exitwindows.mp3"); break;
default : afd = getAssets().openFd("mike.mp3"); break;
};
player.setDataSource(afd.getFileDescriptor(),afd.getStartOffset(),afd.getLength());
player.prepare();
player.start();
} catch (IOException e) { } AssetFileDescriptor assetFileDescriptor = null;
try {
switch (position) {
case 1:
assetFileDescriptor = getAssets().openFd("startwindows.mp3");
break;
case 2:
assetFileDescriptor = getAssets().openFd("exitwindows.mp3");
break;
default:
assetFileDescriptor = getAssets().openFd("mike.mp3");
break;
}
player.setDataSource(assetFileDescriptor.getFileDescriptor(), assetFileDescriptor.getStartOffset(), assetFileDescriptor.getLength());
player.prepare();
player.start();
} 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) { private void startRecordingStopperTimer(final int seconds) {
new Thread(new Runnable() { 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);
// sleep for amount of time // sleep for amount of time
try { try {
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()
{
// change playing icon
adapter.changePlaying(playingPosition, false);
// enable grid
gridView.setEnabled(true);
// set playing Recording position to -1
playingPosition = -1;
}
// Update Recordings received from AppServer
public void UpdateRecordings(ArrayList<Recording> list)
{
//SM.Debug("## UpdateRecordings: " + list.size());
allRecordings = new ArrayList<Recording>();
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);
}
// PlayRecording received from AppServer
public void PlayRecording(long id)
{
// change adapter image
}
// Create runnable for posting
final Runnable UpdateResultsRUN = new Runnable() {
public void run() {
updateResultsInUi();
}
};
private void updateResultsInUi() // Create runnable for posting
{ final Runnable stopRecordingRUN = this::updateStopRecording;
private void updateStopRecording() {
// change playing icon
adapter.changePlaying(getPlayingPosition(), false);
// enable grid
gridView.setEnabled(true);
// set playing Recording position to -1
setPlayingPosition(-1);
}
// Update Recordings received from AppServer
public void updateRecordings(ArrayList<Recording> list) {
setAllRecordings(new ArrayList<>());
for (Recording rec : list) {
if (rec.typeID == 1 && rec.subID == AppParams.USERID)
getAllRecordings().add(rec);
else if (rec.typeID != 1)
getAllRecordings().add(rec);
}
myHandler.post(updateResultsRUN);
}
// playRecording received from AppServer
public void playRecording(long id) {
// change adapter image
}
// Create runnable for posting
final Runnable updateResultsRUN = this::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, context, 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();
gridView.setAdapter(adapter);
}
// send
private void GetRecordings(int radioGWID, int radioID)
{
parentTab.getRecordings(radioGWID, radioID);
}
public void SendPlayRequest(long record_id)
{
parentTab.sendPlayRecordingRequest(record_id);
}
/** Register for broadcasts */
private void registerBroadcastIntents() {
IntentFilter intentFilter = new IntentFilter(OperationCodes.RECORDINGS_LIST_REP+"");
this.registerReceiver(mReceiver, intentFilter);
intentFilter = new IntentFilter(OperationCodes.RADIOID_CHANGED+"");
this.registerReceiver(mReceiver, intentFilter);
}
//The BroadcastReceiver that listens for Notification broadcasts
public final BroadcastReceiver mReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
//SM.Debug("### NOTIFICATION ###", "Radio: " + intent.getAction());
final String action = intent.getAction();
// zone and/or channel changed
if (action.equals(OperationCodes.RECORDINGS_LIST_REP+"")) {
UpdateRecordings(AppParams.recordings);
updateNumberOfRecordings();
}
else if (action.equals(OperationCodes.RADIOID_CHANGED+"")) {
textViewGateway.setText(parentTab.getCrtRadio().IP);
GetRecordings(parentTab.getCrtRadio().GW_ID, parentTab.getCrtRadio().ID);
}
}
};
}
updateNumberOfRecordings();
gridView.setAdapter(adapter);
}
// send
private void getRecordings(int radioGWID, int radioID) {
getParentTab().getRecordings(radioGWID, radioID);
}
public void sendPlayRequest(long recordId) {
getParentTab().sendPlayRecordingRequest(recordId);
}
/**
* Register for broadcasts
*/
private void registerBroadcastIntents() {
IntentFilter intentFilter = new IntentFilter(OperationCodes.RECORDINGS_LIST_REP + "");
this.registerReceiver(mReceiver, intentFilter);
intentFilter = new IntentFilter(OperationCodes.RADIOID_CHANGED + "");
this.registerReceiver(mReceiver, intentFilter);
}
//The BroadcastReceiver that listens for Notification broadcasts
public final BroadcastReceiver mReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
final String action = intent.getAction();
// zone and/or channel changed
if (action.equals(OperationCodes.RECORDINGS_LIST_REP + "")) {
updateRecordings(AppParams.recordings);
updateNumberOfRecordings();
} else if (action.equals(OperationCodes.RADIOID_CHANGED + "")) {
textViewGateway.setText(getParentTab().getCrtRadio().IP);
getRecordings(getParentTab().getCrtRadio().GW_ID, getParentTab().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;
}
}

12
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;
@ -632,7 +630,7 @@ 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.NameForDisplay = "Rob";
@ -657,7 +655,7 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
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);
} }
} }
}); });
@ -1047,7 +1045,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());
} }
@ -1370,7 +1368,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 +1576,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);
} }