SD-211 - fix case when the app was sending request on the ui thread
-fix audio hadler -small refactor
This commit is contained in:
@ -2,10 +2,8 @@ package com.safemobile.safedispatch;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.app.AlertDialog;
|
||||
import android.app.Dialog;
|
||||
import android.content.BroadcastReceiver;
|
||||
import android.content.Context;
|
||||
import android.content.DialogInterface;
|
||||
import android.content.Intent;
|
||||
import android.content.IntentFilter;
|
||||
import android.content.res.AssetFileDescriptor;
|
||||
@ -14,13 +12,12 @@ import android.graphics.Typeface;
|
||||
import android.media.MediaPlayer;
|
||||
import android.os.Bundle;
|
||||
import android.os.Handler;
|
||||
import android.os.Looper;
|
||||
import android.view.View;
|
||||
import android.view.View.OnClickListener;
|
||||
import android.widget.AdapterView;
|
||||
import android.widget.AdapterView.OnItemClickListener;
|
||||
import android.widget.ArrayAdapter;
|
||||
import android.widget.GridView;
|
||||
import android.widget.ImageView;
|
||||
import android.widget.TextView;
|
||||
import android.widget.Toast;
|
||||
|
||||
@ -36,376 +33,352 @@ import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Locale;
|
||||
|
||||
/**
|
||||
* fix import
|
||||
*/
|
||||
|
||||
public class RecordingsActivity extends Activity {
|
||||
private Context context;
|
||||
private Activity activity;
|
||||
public TabLayoutActivity parentTab;
|
||||
public ArrayList<Recording> allRecordings = new ArrayList<Recording>();
|
||||
private ArrayList<Boolean> playingPositions = new ArrayList<Boolean>();
|
||||
private ArrayList<String> allGWsIP = new ArrayList<String>();
|
||||
private GridView gridView;
|
||||
private TabLayoutActivity parentTab;
|
||||
private ArrayList<Recording> allRecordings = new ArrayList<>();
|
||||
private ArrayList<Boolean> playingPositions = new ArrayList<>();
|
||||
private GridView gridView;
|
||||
private RecordingsGridViewAdapter adapter;
|
||||
public View convertViewRecording;
|
||||
|
||||
public int playingPosition = -1;
|
||||
|
||||
private View convertViewRecording;
|
||||
|
||||
private int playingPosition = -1;
|
||||
|
||||
// Need handler for callbacks to the UI thread
|
||||
private final Handler myHandler = new Handler();
|
||||
|
||||
//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);
|
||||
private final Handler myHandler = new Handler(Looper.getMainLooper());
|
||||
private final ArrayList<String> allGWsIP = new ArrayList<>();
|
||||
|
||||
|
||||
// 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, 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);
|
||||
//recoding TCP and audio
|
||||
private RecordingHandle recHandle = null;
|
||||
|
||||
AlertDialog.Builder builder = new AlertDialog.Builder(
|
||||
context);
|
||||
builder.setTitle("Select RadioGW");
|
||||
builder.setAdapter(adapter,
|
||||
new DialogInterface.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(DialogInterface dialog, int which) {
|
||||
// change gateway
|
||||
textViewGateway.setText(allGWsIP.get(which));
|
||||
Toast.makeText(context, getString(R.string.loadingRecordings), Toast.LENGTH_SHORT).show();
|
||||
GetRecordings(parentTab.getAllRadios().get(which).GW_ID, parentTab.getAllRadios().get(which).ID);
|
||||
}
|
||||
});
|
||||
AlertDialog alert = builder.create();
|
||||
alert.show();
|
||||
}
|
||||
/* Dialog */
|
||||
private TextView textViewCount;
|
||||
private TextView textViewGateway;
|
||||
|
||||
private Bundle savedInstanceState;
|
||||
|
||||
/**
|
||||
* Called when the activity is first created.
|
||||
*/
|
||||
@Override
|
||||
public void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
this.setSavedInstanceState(savedInstanceState);
|
||||
setParentTab((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);
|
||||
|
||||
// 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);
|
||||
|
||||
|
||||
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);
|
||||
ImageView image = dialog.findViewById(R.id.image);
|
||||
|
||||
image.setImageResource(R.mipmap.ic_launcher);
|
||||
text.setText(errorMsg);
|
||||
dialog.show();
|
||||
getParentTab().setRecordingsActivity(this);
|
||||
|
||||
// register to receive broadcasts
|
||||
registerBroadcastIntents();
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void onPause()
|
||||
{
|
||||
super.onPause();
|
||||
SM.Debug("onPause");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onResume()
|
||||
{
|
||||
super.onResume();
|
||||
if(parentTab.getTCPState() != null && !AppParams.DEMO){
|
||||
|
||||
Toast.makeText(context, getString(R.string.moreRecordings), Toast.LENGTH_SHORT).show();
|
||||
|
||||
if(parentTab.getCrtRadio() != null)
|
||||
textViewGateway.setText(parentTab.getCrtRadio().IP);
|
||||
|
||||
/*
|
||||
if(parentTab.allRadios == null)
|
||||
GetGWRadios();
|
||||
*/
|
||||
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");
|
||||
}
|
||||
|
||||
private OnItemClickListener onItemClickListener = new OnItemClickListener() {
|
||||
|
||||
@Override
|
||||
public void onBackPressed() {
|
||||
AlertDialog.Builder builder = new AlertDialog.Builder(this);
|
||||
builder.setMessage(getString(R.string.exit))
|
||||
.setCancelable(false)
|
||||
.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());
|
||||
AlertDialog alert = builder.create();
|
||||
alert.show();
|
||||
}
|
||||
|
||||
/**
|
||||
* Update the number of recordings displayed on the top layout
|
||||
*/
|
||||
private void updateNumberOfRecordings() {
|
||||
textViewCount.setText("[" + AppParams.recordings.size() + "]");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onPause() {
|
||||
super.onPause();
|
||||
SM.Debug("onPause");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onResume() {
|
||||
super.onResume();
|
||||
if (getParentTab().getTCPState() != null && !AppParams.DEMO) {
|
||||
|
||||
Toast.makeText(context, getString(R.string.moreRecordings), Toast.LENGTH_SHORT).show();
|
||||
|
||||
if (getParentTab().getCrtRadio() != null)
|
||||
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
|
||||
public void onItemClick(AdapterView<?> arg0, View view, int position, long arg3) {
|
||||
|
||||
|
||||
// disable grid scrolling and item click
|
||||
gridView.setEnabled(false);
|
||||
convertViewRecording = view;
|
||||
|
||||
setConvertViewRecording(view);
|
||||
|
||||
// change background to playing
|
||||
adapter.changePlaying(position, true);
|
||||
|
||||
|
||||
// if no recording is playing and not DEMO
|
||||
if(playingPosition<0 && !AppParams.DEMO)
|
||||
{
|
||||
if (getPlayingPosition() < 0 && !AppParams.DEMO) {
|
||||
// send recording request to App Server
|
||||
SendPlayRequest(allRecordings.get(position).ID);
|
||||
sendPlayRequest(getAllRecordings().get(position).ID);
|
||||
// flag that sound is needed
|
||||
recHandle.StartSound();
|
||||
recHandle.soundNeeded = true;
|
||||
recHandle.startSound();
|
||||
recHandle.setSoundNeeded(true);
|
||||
}
|
||||
// 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
|
||||
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
|
||||
playingPosition = position;
|
||||
|
||||
setPlayingPosition(position);
|
||||
|
||||
// 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 */
|
||||
private void startRecordingStoperTimer(final int seconds) {
|
||||
new Thread(new Runnable() {
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
|
||||
/**
|
||||
* create Timer which will stop the recording after a specific time
|
||||
*/
|
||||
private void startRecordingStopperTimer(final int seconds) {
|
||||
new Thread(() -> {
|
||||
// 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
|
||||
try {
|
||||
Thread.sleep(ms);
|
||||
} catch (InterruptedException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
Thread.currentThread().interrupt();
|
||||
}
|
||||
|
||||
// modify the UI after the recording is done playing
|
||||
myHandler.post(stopRecordingRUN);
|
||||
}
|
||||
}).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();
|
||||
}
|
||||
};
|
||||
}).start();
|
||||
}
|
||||
};
|
||||
|
||||
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
|
||||
playingPositions = new ArrayList<Boolean>();
|
||||
for(int i=0; i<allRecordings.size(); i++)
|
||||
playingPositions = new ArrayList<>();
|
||||
for (int i = 0; i < getAllRecordings().size(); i++)
|
||||
playingPositions.add(true);
|
||||
// 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
|
||||
playingPositions.clear();
|
||||
for(int i=0; i<allRecordings.size(); i++)
|
||||
for (int i = 0; i < getAllRecordings().size(); i++)
|
||||
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;
|
||||
}
|
||||
}
|
||||
@ -14,13 +14,11 @@ import java.util.Timer;
|
||||
import java.util.TimerTask;
|
||||
|
||||
import com.google.android.gms.tasks.Task;
|
||||
import com.google.android.gms.tasks.TaskCompletionSource;
|
||||
import com.safemobile.activities.AbstractEmptyActivity;
|
||||
import com.safemobile.activities.AbstractLiveActivity;
|
||||
import com.safemobile.activities.AbstractMessagesActivity;
|
||||
import com.safemobile.activities.AbstractRadioActivity;
|
||||
import com.safemobile.activities.AbstractSDParentActivity;
|
||||
import com.safemobile.safedispatch.R;
|
||||
import com.safemobile.enums.AuthorizationCode;
|
||||
import com.safemobile.enums.AuthorizationStatus;
|
||||
import com.safemobile.enums.ProviderSettingsStatus;
|
||||
@ -632,7 +630,7 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
|
||||
tabHost.setCurrentTabByTag(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<>();
|
||||
Recording rec = new Recording();
|
||||
rec.NameForDisplay = "Rob";
|
||||
@ -657,7 +655,7 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
|
||||
rec.startGMT = rec.endGMT - 3;
|
||||
listRecordings.add(rec);
|
||||
rec.type = 103;
|
||||
getRecordingsActivity().UpdateRecordings(listRecordings);
|
||||
getRecordingsActivity().updateRecordings(listRecordings);
|
||||
}
|
||||
}
|
||||
});
|
||||
@ -1047,7 +1045,7 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
|
||||
if (getMessageActivity() != null)
|
||||
getMessageActivity().onCreate(getMessageActivity().getSavedInstanceState());
|
||||
if (getRecordingsActivity() != null)
|
||||
getRecordingsActivity().onCreate(getRecordingsActivity().savedInstanceState);
|
||||
getRecordingsActivity().onCreate(getRecordingsActivity().getSavedInstanceState());
|
||||
if (getAlarmActivity() != null)
|
||||
getAlarmActivity().onCreate(getAlarmActivity().getSavedInstanceState());
|
||||
}
|
||||
@ -1370,7 +1368,7 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
|
||||
try {
|
||||
long id = Long.parseLong(tmp);
|
||||
if (getRecordingsActivity() != null)
|
||||
getRecordingsActivity().PlayRecording(id);
|
||||
getRecordingsActivity().playRecording(id);
|
||||
} catch (Exception ex) {
|
||||
SM.Exception(ex.toString());
|
||||
}
|
||||
@ -1578,7 +1576,7 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
|
||||
if (radioMSG.incCall.callStatus == 3) {
|
||||
setInCall(false);
|
||||
// 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
|
||||
getRecordings(getCrtRadio().GW_ID, getCrtRadio().ID);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user