Compare commits
No commits in common. "develop" and "refresh_list_after_on_item_click" have entirely different histories.
develop
...
refresh_li
3
.gitignore
vendored
3
.gitignore
vendored
|
|
@ -184,6 +184,3 @@ $RECYCLE.BIN/
|
|||
/.idea/misc.xml
|
||||
/.idea
|
||||
/.idea/modules.xml
|
||||
|
||||
/safeDispatch/debug
|
||||
/safeDispatch/release
|
||||
|
|
|
|||
|
|
@ -25,7 +25,6 @@ public abstract class AbstractLiveActivity extends AppCompatActivity {
|
|||
public abstract void vehicleStatusReceived(long imei, int opCode, int status); // --> UpdateOptions
|
||||
public abstract void emergencyAlarmReceived(int position, double lat, double lng); // --> UpdateEmergencyAlarm
|
||||
public abstract GoogleMap getMap(); // --> UpdateEmergencyAlarm
|
||||
public abstract void setLanguage();
|
||||
|
||||
/** Misc */
|
||||
public AbstractSDParentActivity getParentTab() {
|
||||
|
|
|
|||
|
|
@ -16,9 +16,9 @@ import android.widget.Toast;
|
|||
public class TCPService extends Service {
|
||||
|
||||
private int[] startModes = {START_STICKY, START_NOT_STICKY, START_REDELIVER_INTENT};
|
||||
private int mStartMode = startModes[0]; // indicates how to behave if the service is killed
|
||||
private int mStartMode = startModes[0]; // indicates how to behave if the service is killed
|
||||
private IBinder mBinder = new TCPBinder(); // interface for clients that bind
|
||||
private boolean mAllowRebind = true; // indicates whether onRebind should be used
|
||||
private boolean mAllowRebind = true; // indicates whether onRebind should be used
|
||||
private TCPhandler tcp = null;
|
||||
private TCPmsgParser tcpParser = null;
|
||||
|
||||
|
|
@ -102,8 +102,10 @@ public class TCPService extends Service {
|
|||
|
||||
|
||||
/** Stop TCP Connection */
|
||||
public void stopTCPConnection() {
|
||||
if(tcp != null) {
|
||||
public void stopTCPConnection()
|
||||
{
|
||||
if(tcp != null)
|
||||
{
|
||||
tcp.Stop();
|
||||
tcp = null;
|
||||
}
|
||||
|
|
@ -112,7 +114,27 @@ public class TCPService extends Service {
|
|||
/** restart the TCP Connection after the connection parameters had been changed */
|
||||
public void recreateTCPConnection()
|
||||
{
|
||||
recreateTCPConnection(AppParams.IP, AppParams.PORT);
|
||||
/*
|
||||
Thread t = new Thread(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
try {
|
||||
Thread.sleep(1000*2);
|
||||
} catch (InterruptedException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
*/
|
||||
// create a tcp connection
|
||||
int port = 13589;
|
||||
try {
|
||||
port = Integer.parseInt(AppParams.PORT);
|
||||
}
|
||||
catch(Exception ex) { }
|
||||
tcp = new TCPhandler(getApplicationContext(), AppParams.IP, port);
|
||||
/* }
|
||||
});
|
||||
t.start();
|
||||
*/
|
||||
}
|
||||
|
||||
public void recreateTCPConnection(String _ip, String _port)
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ import android.content.Intent;
|
|||
import android.content.IntentFilter;
|
||||
import android.net.ConnectivityManager;
|
||||
import android.net.wifi.WifiManager;
|
||||
import android.util.Log;
|
||||
|
||||
import com.safemobile.lib.AppParams;
|
||||
import com.safemobile.lib.SM;
|
||||
|
|
@ -25,7 +24,6 @@ import java.util.TimerTask;
|
|||
|
||||
|
||||
public class TCPhandler implements Runnable {
|
||||
private final String TAG = "TCPhandler";
|
||||
private boolean alive = true;
|
||||
|
||||
public String serverHostname;
|
||||
|
|
@ -58,22 +56,18 @@ public class TCPhandler implements Runnable {
|
|||
|
||||
// create timer to check socket status
|
||||
Timer timer = new Timer();
|
||||
try {
|
||||
timer.scheduleAtFixedRate(new TimerTask() {
|
||||
@Override
|
||||
public void run() {
|
||||
try {
|
||||
previousConnectionWasUP = isConnectionUP;
|
||||
// try to send something
|
||||
TCPmsgParser._fireonTCPConnectionStatusEvent(isConnectionUP, previousConnectionWasUP);
|
||||
} catch (Exception e) {
|
||||
SM.Exception("TIMERException", e.toString());
|
||||
}
|
||||
timer.scheduleAtFixedRate(new TimerTask() {
|
||||
@Override
|
||||
public void run() {
|
||||
try {
|
||||
previousConnectionWasUP = isConnectionUP;
|
||||
// try to send something
|
||||
TCPmsgParser._fireonTCPConnectionStatusEvent(isConnectionUP, previousConnectionWasUP);
|
||||
} catch (Exception e) {
|
||||
SM.Exception("TIMERException", e.toString());
|
||||
}
|
||||
}, 0, 3000);
|
||||
} catch(Exception e) {
|
||||
Log.v("Exception", e.getMessage());
|
||||
}
|
||||
}
|
||||
}, 0, 3000);
|
||||
|
||||
// get WiFi state
|
||||
isWiFiOn = isNetworkConnected();
|
||||
|
|
@ -110,8 +104,6 @@ public class TCPhandler implements Runnable {
|
|||
SM.Debug("IllegalArgumentException", "TCPhandler break:"+ e);
|
||||
} catch (IOException e) {
|
||||
SM.Debug("IOException", "TCPhandler break:"+ e);
|
||||
} catch (Exception e) {
|
||||
Log.v("Exception", e.getMessage());
|
||||
}
|
||||
|
||||
while (alive) {
|
||||
|
|
@ -119,8 +111,6 @@ public class TCPhandler implements Runnable {
|
|||
Thread.sleep(3000);
|
||||
} catch (InterruptedException e) {
|
||||
SM.Debug("TCPhandler Crash1 on sleep:"+ e);
|
||||
} catch (Exception e) {
|
||||
Log.v("Exception", e.getMessage());
|
||||
}
|
||||
|
||||
while (Boolean.TRUE.equals(isConnectionUP)) {
|
||||
|
|
@ -252,8 +242,6 @@ public class TCPhandler implements Runnable {
|
|||
Thread.sleep(1000);
|
||||
} catch (InterruptedException e) {
|
||||
SM.Debug("TCPhandler Crash2 on sleep:"+ e);
|
||||
} catch (Exception e) {
|
||||
Log.v("Exception", e.getMessage());
|
||||
}
|
||||
//try to restart connection
|
||||
if (alive && isWiFiOn)
|
||||
|
|
@ -362,7 +350,6 @@ public class TCPhandler implements Runnable {
|
|||
if (soc != null)
|
||||
soc.close();
|
||||
} catch (IOException e1) {
|
||||
Log.v("IOException", e1.getMessage());
|
||||
e1.printStackTrace();
|
||||
}
|
||||
|
||||
|
|
@ -384,15 +371,14 @@ public class TCPhandler implements Runnable {
|
|||
|
||||
private void restartTCP() {
|
||||
try {
|
||||
Log.v(TAG, "restartTCP");
|
||||
isConnectionUP = false;
|
||||
previousConnectionWasUP = false;
|
||||
|
||||
SM.Debug("Restarting TCP...ip:" + serverHostname + ":" + port);
|
||||
soc = new Socket();
|
||||
soc.connect(new InetSocketAddress(serverHostname, port), 50000);
|
||||
input = new DataInputStream(soc.getInputStream());
|
||||
soc.connect(new InetSocketAddress(serverHostname, port), 5000);
|
||||
|
||||
input = new DataInputStream(soc.getInputStream());
|
||||
//output stream
|
||||
output = new DataOutputStream(soc.getOutputStream());
|
||||
|
||||
|
|
@ -400,11 +386,17 @@ public class TCPhandler implements Runnable {
|
|||
isConnectionUP = true;
|
||||
}
|
||||
|
||||
} catch (NullPointerException | IOException e) {
|
||||
SM.Exception("restartTCP break:" + e);
|
||||
} catch (UnknownHostException e) {
|
||||
SM.Exception("restartTCP break:" + e.toString());
|
||||
isConnectionUP = false;
|
||||
} catch (IllegalArgumentException e) {
|
||||
SM.Debug("IllegalArgumentException", "restartTCP break:" + e);
|
||||
SM.Debug("IllegalArgumentException", "restartTCP break:" + e.toString());
|
||||
} catch (IOException e) {
|
||||
SM.Exception("restartTCP break:" + e.toString());
|
||||
isConnectionUP = false;
|
||||
} catch (NullPointerException e) {
|
||||
SM.Exception("restartTCP break:" + e.toString());
|
||||
isConnectionUP = false;
|
||||
}
|
||||
triggerTCPConnectionStateEvent();
|
||||
}
|
||||
|
|
@ -418,7 +410,6 @@ public class TCPhandler implements Runnable {
|
|||
soc.close();
|
||||
soc = null;
|
||||
} catch (IOException e) {
|
||||
Log.v("IOException", e.getMessage());
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
BIN
safeDispatch/release/SafeDispatchMobile_v.8.0.35-release.aab
Normal file
BIN
safeDispatch/release/SafeDispatchMobile_v.8.0.35-release.aab
Normal file
Binary file not shown.
BIN
safeDispatch/release/SafeDispatchMobile_v.8.0.49-release.aab
Normal file
BIN
safeDispatch/release/SafeDispatchMobile_v.8.0.49-release.aab
Normal file
Binary file not shown.
20
safeDispatch/release/output-metadata.json
Normal file
20
safeDispatch/release/output-metadata.json
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
{
|
||||
"version": 3,
|
||||
"artifactType": {
|
||||
"type": "APK",
|
||||
"kind": "Directory"
|
||||
},
|
||||
"applicationId": "com.safemobile.safedispatch",
|
||||
"variantName": "release",
|
||||
"elements": [
|
||||
{
|
||||
"type": "SINGLE",
|
||||
"filters": [],
|
||||
"attributes": [],
|
||||
"versionCode": 8000035,
|
||||
"versionName": "8.0.35",
|
||||
"outputFile": "SafeDispatchMobile_v.8.0.35-release.apk"
|
||||
}
|
||||
],
|
||||
"elementType": "File"
|
||||
}
|
||||
|
|
@ -7,7 +7,6 @@
|
|||
android:glEsVersion="0x00020000"
|
||||
android:required="true" />
|
||||
|
||||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
||||
<uses-permission android:name="android.permission.CAMERA" android:required="false"/>
|
||||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
||||
|
|
|
|||
|
|
@ -107,6 +107,7 @@ public class TcpAudioClient implements Runnable {
|
|||
recv = soc.getInputStream();
|
||||
writer = soc.getOutputStream();
|
||||
setConnOK(true);
|
||||
|
||||
} catch (IOException e) {
|
||||
SM.Debug("break:" + e);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -66,7 +66,6 @@ public class AlarmActivity extends Activity {
|
|||
setContentView(R.layout.tabalarm);
|
||||
|
||||
gridView = findViewById(R.id.gridViewAlarms);
|
||||
gridView.setNestedScrollingEnabled(true);
|
||||
adapter = new AlertGridViewAdapter(this, getAllAlarms(), context, acknowledged);
|
||||
gridView.setAdapter(adapter);
|
||||
|
||||
|
|
@ -172,10 +171,7 @@ public class AlarmActivity extends Activity {
|
|||
if (param.equals(ALARM)) {
|
||||
// set adapter
|
||||
adapter = new AlertGridViewAdapter(this, getAllAlarms(), context, acknowledged);
|
||||
int position = gridView.getFirstVisiblePosition();
|
||||
|
||||
gridView.setAdapter(adapter);
|
||||
gridView.setSelection(position);
|
||||
} else {
|
||||
adapter.changeACK(ackPosition);
|
||||
SM.Debug("Set ACK: " + ackPosition + " | " + (Boolean.TRUE.equals(acknowledged.get(ackPosition)) ? "true" : "false"));
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@ import java.util.ArrayList;
|
|||
import java.util.Date;
|
||||
import java.util.Hashtable;
|
||||
import java.util.Locale;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
|
||||
public class GoogleMapsInfoBubble implements GoogleMap.InfoWindowAdapter {
|
||||
|
|
@ -91,38 +90,28 @@ public class GoogleMapsInfoBubble implements GoogleMap.InfoWindowAdapter {
|
|||
|
||||
boolean isMilitaryTime = false;
|
||||
Date positionTime;
|
||||
long timeGMT = 0;
|
||||
String speed, address, gpsLocation, name = "";
|
||||
if (isLiveTab) {
|
||||
SuperVehicle vehicle = superVehHash.get(key);
|
||||
|
||||
//positionTime = new Date((new Date()).getTime() - vehicle.timeGMT);
|
||||
|
||||
timeGMT = vehicle.timeGMT;
|
||||
positionTime = new Date((new Date()).getTime() - vehicle.timeGMT);
|
||||
address = vehicle.Address != null ? vehicle.Address : "";
|
||||
name = vehicle.name;
|
||||
speed = String.format(context.getResources().getString(R.string.speedMph), (int)(0.621371192 * vehicle.speed));
|
||||
speed = String.format(context.getResources().getString(R.string.speedMph), vehicle.speed);
|
||||
gpsLocation = "[" + String.format("%.4f", vehicle.lat) + "," + String.format("%.4f",vehicle.lng) + "]";
|
||||
} else {
|
||||
HistPos histPos = histPosList.get(position);
|
||||
|
||||
//positionTime = new Date((new Date()).getTime() - histPos.timeGMT);
|
||||
timeGMT = histPos.timeGMT;
|
||||
positionTime = new Date((new Date()).getTime() - histPos.timeGMT);
|
||||
address = histPos.Address != null ? histPos.Address : "";
|
||||
speed = String.format(context.getResources().getString(R.string.speedMph), (int)(0.621371192 * histPos.speed));
|
||||
speed = String.format(context.getResources().getString(R.string.speedMph), histPos.speed);
|
||||
gpsLocation = "[" + String.format("%.4f", histPos.lat) + "," + String.format("%.4f",histPos.lng) + "]";
|
||||
}
|
||||
|
||||
//String timeFormat = isMilitaryTime
|
||||
// ? "HH:mm:ss dd.MMM.yyyy"
|
||||
// : "hh:mm:ss a dd.MMM.yyy";
|
||||
|
||||
//DateFormat format = new SimpleDateFormat(timeFormat, Locale.ENGLISH);
|
||||
//tvTimeAgo.setText(format.format(positionTime));
|
||||
|
||||
DateFormat format = new SimpleDateFormat("hh:mm:ss", Locale.ENGLISH);
|
||||
tvTimeAgo.setText( getDateTimeAgo(timeGMT * 1000) + " [" + format.format(new Date(timeGMT*1000) ) + "]");
|
||||
String timeFormat = isMilitaryTime
|
||||
? "HH:mm:ss dd.MMM.yyyy"
|
||||
: "hh:mm:ss a dd.MMM.yyy";
|
||||
|
||||
DateFormat format = new SimpleDateFormat(timeFormat, Locale.ENGLISH);
|
||||
tvTimeAgo.setText(format.format(positionTime));
|
||||
tvStreetView.setText(address);
|
||||
streetView.setVisibility(address.length() > 0 ? View.VISIBLE : View.GONE);
|
||||
tvStreetView.setVisibility(address.length() > 0 ? View.VISIBLE : View.GONE);
|
||||
|
|
@ -134,38 +123,5 @@ public class GoogleMapsInfoBubble implements GoogleMap.InfoWindowAdapter {
|
|||
tvSpeed.setText(speed);
|
||||
tvGPSLocation.setText(gpsLocation);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Get a text representation for the date time representing
|
||||
/// the difference in minutes/hours/days from now
|
||||
/// </summary>
|
||||
/// <param name="utcTime">DateTime value which needs to be converted</param>
|
||||
/// <returns>String 'Ago' representation fot he date</returns>
|
||||
public static String getDateTimeAgo(long time)
|
||||
{
|
||||
String timeValue = "";
|
||||
|
||||
long diffInMs = (new Date().getTime() - time);
|
||||
|
||||
long secondsDifference = TimeUnit.MILLISECONDS.toSeconds(diffInMs);;
|
||||
|
||||
if (secondsDifference < 60)
|
||||
timeValue = "less than 1 minute";
|
||||
else if (secondsDifference < 3600)
|
||||
timeValue = (secondsDifference / 60) + " minute" + ((secondsDifference / 60) > 1 ? "s" : "") + " ago";
|
||||
else if (secondsDifference < 7200)
|
||||
timeValue = "1 hour ago";
|
||||
else if (secondsDifference < 86400)
|
||||
{
|
||||
timeValue = (secondsDifference / 3600) + " hours ago";
|
||||
}
|
||||
else
|
||||
{
|
||||
timeValue = (secondsDifference / 86400) + " days ago";
|
||||
}
|
||||
|
||||
return timeValue;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -132,17 +132,6 @@ public class HistoryActivity extends AppCompatActivity implements OnMapReadyCall
|
|||
setDate();
|
||||
}
|
||||
|
||||
public void setLanguage() {
|
||||
TextView labelVehicle = findViewById(R.id.labelVehicle);
|
||||
TextView labelStartDate = findViewById(R.id.labelStartDate);
|
||||
TextView labelEndDate = findViewById(R.id.labelEndDate);
|
||||
|
||||
labelVehicle.setText(R.string.vehicle);
|
||||
labelStartDate.setText(R.string.startDate);
|
||||
labelEndDate.setText(R.string.endDate);
|
||||
displayButton.setText(R.string.display);
|
||||
}
|
||||
|
||||
private void displayHistory(ArrayList<HistPos> positions) {
|
||||
LatLng latLng = null;
|
||||
PolylineOptions polylineOptions = new PolylineOptions();
|
||||
|
|
@ -179,9 +168,8 @@ public class HistoryActivity extends AppCompatActivity implements OnMapReadyCall
|
|||
|
||||
private void setDate() {
|
||||
Calendar calendar = Calendar.getInstance();
|
||||
calendar.add(Calendar.DATE, 1);
|
||||
endDate = calendar.getTime();
|
||||
calendar.add(Calendar.DATE, -2);
|
||||
calendar.add(Calendar.DATE, -1);
|
||||
startDate = calendar.getTime();
|
||||
|
||||
TextView textViewStartDate = findViewById(R.id.textViewStartDate);
|
||||
|
|
@ -291,5 +279,6 @@ public class HistoryActivity extends AppCompatActivity implements OnMapReadyCall
|
|||
this.googleMap.getUiSettings().setMapToolbarEnabled(false);
|
||||
|
||||
parentTab.demoPositionsList();
|
||||
displayButton.performClick();
|
||||
}
|
||||
}
|
||||
|
|
@ -296,11 +296,6 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
|
|||
registerBroadcastIntents();
|
||||
}
|
||||
|
||||
public void setLanguage() {
|
||||
TextView textView = findViewById(R.id.unit_name);
|
||||
textView.setText(R.string.unitName);
|
||||
}
|
||||
|
||||
/**
|
||||
* Manipulates the map once available.
|
||||
* This callback is triggered when the map is ready to be used.
|
||||
|
|
@ -449,6 +444,12 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
|
|||
|
||||
public void displayVehicle(double latZoom, double lngZoom) {
|
||||
if (googleMap != null) {
|
||||
String openWindow = "";
|
||||
for (Marker marker : markers) {
|
||||
if (marker.isInfoWindowShown()) {
|
||||
openWindow = marker.getTitle();
|
||||
}
|
||||
}
|
||||
googleMap.clear();
|
||||
|
||||
for (int i = 0; i < displayedVehicles.size(); i++) {
|
||||
|
|
@ -463,8 +464,7 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
|
|||
markerOptions.icon(markerIcon);
|
||||
|
||||
Marker marker = this.googleMap.addMarker(markerOptions);
|
||||
|
||||
if (i == lastItemClicked) {
|
||||
if (openWindow.equals(marker.getTitle()) || i == lastItemClicked) {
|
||||
marker.showInfoWindow();
|
||||
googleMap.moveCamera(CameraUpdateFactory.newLatLngZoom(newLocation, 14));
|
||||
}
|
||||
|
|
@ -474,6 +474,7 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
|
|||
}
|
||||
}
|
||||
}
|
||||
lastItemClicked = 0;
|
||||
}
|
||||
|
||||
private BitmapDescriptor getProperBitmap(int largeIcon, String text) {
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@ import android.graphics.Typeface;
|
|||
import android.os.Bundle;
|
||||
import android.os.Handler;
|
||||
import android.os.Looper;
|
||||
import android.util.Log;
|
||||
import android.view.View;
|
||||
import android.widget.ArrayAdapter;
|
||||
import android.widget.Button;
|
||||
|
|
@ -46,7 +45,6 @@ public class MessagesActivity extends Activity {
|
|||
/**
|
||||
* Called when the activity is first created.
|
||||
*/
|
||||
private final String TAG = "MessagesActivity";
|
||||
|
||||
private MessagesGridViewAdapter mAdapter;
|
||||
private ConversationGridViewAdapter convAdapter;
|
||||
|
|
@ -140,7 +138,6 @@ public class MessagesActivity extends Activity {
|
|||
|
||||
// Implement On Item click listener
|
||||
gridView.setOnItemClickListener((arg0, arg1, position, arg3) -> {
|
||||
Log.v(TAG, "onItemClick " + LASTMESSAGES);
|
||||
if (LASTMESSAGES) {
|
||||
// get position
|
||||
Msg item = mAdapter.getItem(position);
|
||||
|
|
@ -170,8 +167,6 @@ public class MessagesActivity extends Activity {
|
|||
// button send message
|
||||
imageButtonSend = findViewById(R.id.imageButtonSend);
|
||||
imageButtonSend.setOnClickListener(v -> {
|
||||
if (editTextMsg.getText().toString().isEmpty())
|
||||
return;
|
||||
sendSMS(getScId(), editTextMsg.getText().toString());
|
||||
Toast.makeText(context, "Sending message...", Toast.LENGTH_SHORT).show();
|
||||
// disable send button and editBox
|
||||
|
|
@ -199,7 +194,6 @@ public class MessagesActivity extends Activity {
|
|||
imageButtonBack.setOnClickListener(v -> {
|
||||
// set LastMessage conversation type
|
||||
LASTMESSAGES = true;
|
||||
Log.v(TAG, "lastmessages: true");
|
||||
// refresh Grid
|
||||
getLastSMS();
|
||||
if (AppParams.DEMO)
|
||||
|
|
@ -392,7 +386,6 @@ public class MessagesActivity extends Activity {
|
|||
listLastMessages.add(new Msg(sentVehicle, txt, Calendar.getInstance().getTime(), sendSMSSeqID));
|
||||
}
|
||||
SM.Debug("time: " + timeGMT + " | " + Calendar.getInstance().getTime());
|
||||
Log.v(TAG, "lastmessages: false");
|
||||
LASTMESSAGES = false;
|
||||
|
||||
updateResultsInUi();
|
||||
|
|
@ -632,7 +625,6 @@ public class MessagesActivity extends Activity {
|
|||
setScId(item.sc_id);
|
||||
SM.Debug("Selected scId: " + getScId());
|
||||
// set Conversation type
|
||||
Log.v(TAG, "lastmessages: false");
|
||||
LASTMESSAGES = false;
|
||||
// call get SMS
|
||||
getSMS4unit(getScId());
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -26,7 +26,6 @@ import com.safemobile.lib.AppParams;
|
|||
import com.safemobile.lib.OperationCodes;
|
||||
import com.safemobile.lib.Recording;
|
||||
import com.safemobile.lib.SM;
|
||||
import com.safemobile.lib.Vehicle;
|
||||
import com.safemobile.lib.radio.RadioGW;
|
||||
import com.safemobile.lib.sound.RecordingHandle;
|
||||
|
||||
|
|
@ -296,27 +295,9 @@ public class RecordingsActivity extends Activity {
|
|||
private void updateResultsInUi() {
|
||||
// clear played items
|
||||
playingPositions = new ArrayList<>();
|
||||
|
||||
ArrayList<Recording> recordings = getAllRecordings();
|
||||
ArrayList<Recording> filteredList = new ArrayList<>();
|
||||
ArrayList<Vehicle> vehicles = getParentTab().getAllVehicle();
|
||||
for (Recording recording : recordings) {
|
||||
if (recording.callType == 0 || recording.callType == 4) {
|
||||
for (Vehicle vehicle : vehicles)
|
||||
if (vehicle.imei.equals(String.valueOf(recording.subID))) {
|
||||
filteredList.add(recording);
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
filteredList.add(recording);
|
||||
}
|
||||
}
|
||||
|
||||
setAllRecordings(filteredList);
|
||||
|
||||
for (int i = 0; i < getAllRecordings().size(); i++)
|
||||
playingPositions.add(true);
|
||||
|
||||
// set adapter - where playingPositions stores exists values
|
||||
adapter = new RecordingsGridViewAdapter(activity, getAllRecordings(), playingPositions);
|
||||
|
||||
// playing positions need to be false because no recording is played
|
||||
|
|
|
|||
|
|
@ -10,19 +10,13 @@ import android.content.ServiceConnection;
|
|||
import android.content.SharedPreferences;
|
||||
import android.content.res.Configuration;
|
||||
import android.graphics.Color;
|
||||
import android.net.ConnectivityManager;
|
||||
import android.net.Network;
|
||||
import android.net.NetworkCapabilities;
|
||||
import android.net.NetworkRequest;
|
||||
import android.os.AsyncTask;
|
||||
import android.os.Build;
|
||||
import android.os.Bundle;
|
||||
import android.os.Handler;
|
||||
import android.os.IBinder;
|
||||
import android.os.Looper;
|
||||
import android.text.Editable;
|
||||
import android.text.InputType;
|
||||
import android.util.Log;
|
||||
import android.view.Gravity;
|
||||
import android.view.View;
|
||||
import android.view.View.OnClickListener;
|
||||
|
|
@ -120,17 +114,6 @@ public class SDMobileActivity extends Activity {
|
|||
super.onCreate(savedInstanceState);
|
||||
SM.Debug("##### onCREATE ##### with LANGUAGE " + AppParams.LANGUAGETMP);
|
||||
|
||||
ConnectivityManager connectivityManager =
|
||||
(ConnectivityManager) this.getSystemService(Context.CONNECTIVITY_SERVICE);
|
||||
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
|
||||
connectivityManager.registerDefaultNetworkCallback(networkCallback);
|
||||
else {
|
||||
NetworkRequest request = new NetworkRequest.Builder()
|
||||
.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET).build();
|
||||
connectivityManager.registerNetworkCallback(request, networkCallback);
|
||||
}
|
||||
|
||||
AppParams.theme = AppParams.Theme.SAFEDISPATCH;
|
||||
if (AppParams.theme == AppParams.Theme.SAFENET)
|
||||
this.setTheme(R.style.Theme_Safenet);
|
||||
|
|
@ -549,21 +532,6 @@ public class SDMobileActivity extends Activity {
|
|||
SM.Debug("##### onRESUME #####");
|
||||
}
|
||||
|
||||
private final ConnectivityManager.NetworkCallback networkCallback = new ConnectivityManager.NetworkCallback() {
|
||||
@Override
|
||||
public void onAvailable(Network network) {
|
||||
// network available
|
||||
Log.v("NetworkAvailability", "available");
|
||||
if (tcp != null && !tcp.isConnectionUP)
|
||||
saveIPandRestartTCP(AppParams.IP, AppParams.PORT);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onLost(Network network) {
|
||||
// network unavailable
|
||||
Log.v("NetworkAvailability", "unavailable");
|
||||
}
|
||||
};
|
||||
|
||||
private void startTabActivity(long userID) {
|
||||
// good login - load activity
|
||||
|
|
|
|||
|
|
@ -2,13 +2,16 @@ package com.safemobile.safedispatch;
|
|||
|
||||
import java.util.Locale;
|
||||
|
||||
/** fix import */
|
||||
import com.safemobile.adapters.LanguageSpinnerAdapter;
|
||||
import com.safemobile.lib.AppParams;
|
||||
import com.safemobile.lib.SM;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.app.AlertDialog;
|
||||
import android.app.Dialog;
|
||||
import android.content.Context;
|
||||
import android.content.DialogInterface;
|
||||
import android.content.SharedPreferences;
|
||||
import android.content.res.Configuration;
|
||||
import android.os.Bundle;
|
||||
|
|
@ -70,49 +73,52 @@ public class SetupActivity extends Activity {
|
|||
setContentView(R.layout.tabsetup);
|
||||
|
||||
|
||||
layoutSpinnerLanguage = findViewById(R.id.layoutSpinnerLanguage);
|
||||
layoutSpinnerLanguage = (LinearLayout) findViewById(R.id.layoutSpinnerLanguage);
|
||||
layoutSpinnerLanguage.setOnClickListener(LanguageListener);
|
||||
imageLanguage = findViewById(R.id.imageLanguage);
|
||||
textViewSpinnerLanguage = findViewById(R.id.textViewSpinnerLanguage);
|
||||
imageLanguage = (ImageView) findViewById(R.id.imageLanguage);
|
||||
textViewSpinnerLanguage = (TextView) findViewById(R.id.textViewSpinnerLanguage);
|
||||
|
||||
// change spinner icon and selected language according to tmpLanguage
|
||||
switch (AppParams.LANGUAGETMP) {
|
||||
case "en":
|
||||
imageLanguage.setImageResource(R.drawable.en);
|
||||
textViewSpinnerLanguage.setText(getString(R.string.en));
|
||||
break;
|
||||
case "de":
|
||||
imageLanguage.setImageResource(R.drawable.de);
|
||||
textViewSpinnerLanguage.setText(getString(R.string.de));
|
||||
break;
|
||||
case "tr":
|
||||
imageLanguage.setImageResource(R.drawable.tr);
|
||||
textViewSpinnerLanguage.setText(getString(R.string.tr));
|
||||
break;
|
||||
case "ro":
|
||||
imageLanguage.setImageResource(R.drawable.ro);
|
||||
textViewSpinnerLanguage.setText(getString(R.string.ro));
|
||||
break;
|
||||
case "es":
|
||||
imageLanguage.setImageResource(R.drawable.es);
|
||||
textViewSpinnerLanguage.setText(getString(R.string.es));
|
||||
break;
|
||||
case "ru":
|
||||
imageLanguage.setImageResource(R.drawable.ru);
|
||||
textViewSpinnerLanguage.setText(getString(R.string.ru));
|
||||
break;
|
||||
if (AppParams.LANGUAGETMP.equals("en")){
|
||||
imageLanguage.setImageResource(R.drawable.en);
|
||||
textViewSpinnerLanguage.setText(getString(R.string.en));
|
||||
}
|
||||
else if (AppParams.LANGUAGETMP.equals("de")){
|
||||
imageLanguage.setImageResource(R.drawable.de);
|
||||
textViewSpinnerLanguage.setText(getString(R.string.de));
|
||||
}
|
||||
else if (AppParams.LANGUAGETMP.equals("tr")){
|
||||
imageLanguage.setImageResource(R.drawable.tr);
|
||||
textViewSpinnerLanguage.setText(getString(R.string.tr));
|
||||
}
|
||||
else if (AppParams.LANGUAGETMP.equals("ro")){
|
||||
imageLanguage.setImageResource(R.drawable.ro);
|
||||
textViewSpinnerLanguage.setText(getString(R.string.ro));
|
||||
}
|
||||
else if(AppParams.LANGUAGETMP.equals("es")){
|
||||
imageLanguage.setImageResource(R.drawable.es);
|
||||
textViewSpinnerLanguage.setText(getString(R.string.es));
|
||||
}
|
||||
else if(AppParams.LANGUAGETMP.equals("ru")){
|
||||
imageLanguage.setImageResource(R.drawable.ru);
|
||||
textViewSpinnerLanguage.setText(getString(R.string.ru));
|
||||
}
|
||||
|
||||
// get visual elements
|
||||
appServerIP = findViewById(R.id.appServerIP);
|
||||
appServerPort = findViewById(R.id.appServerPort);
|
||||
appServerIP = (EditText) findViewById(R.id.appServerIP);
|
||||
appServerPort = (EditText) findViewById(R.id.appServerPort);
|
||||
|
||||
// hide path layout used only on Pad/Pod
|
||||
layoutPath = findViewById(R.id.layoutPath);
|
||||
layoutPath = (LinearLayout) findViewById(R.id.layoutPath);
|
||||
layoutPath.setVisibility(View.GONE);
|
||||
btn_save = findViewById(R.id.btn_save);
|
||||
btn_save = (Button) findViewById(R.id.btn_save);
|
||||
|
||||
btn_save.setOnClickListener(v -> saveSettings());
|
||||
btn_save.setOnClickListener(new OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
saveSettings();
|
||||
}
|
||||
});
|
||||
|
||||
// set values
|
||||
if(!AppParams.IP.equals("n/a"))
|
||||
|
|
@ -128,31 +134,46 @@ public class SetupActivity extends Activity {
|
|||
AlertDialog.Builder builder = new AlertDialog.Builder(this);
|
||||
builder.setMessage(getString(R.string.exit))
|
||||
.setCancelable(false)
|
||||
.setNeutralButton(getString(R.string.logout), (dialog, id) -> parentTab.whenBackPressed(AppParams.ActivityResult.logout))
|
||||
.setPositiveButton(getString(R.string.ext), (dialog, id) -> parentTab.whenBackPressed(AppParams.ActivityResult.exit))
|
||||
.setNegativeButton(getString(R.string.cancel), (dialog, id) -> dialog.cancel());
|
||||
.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();
|
||||
}
|
||||
|
||||
// listener when select language pressed
|
||||
private final OnClickListener LanguageListener = new OnClickListener() {
|
||||
private OnClickListener LanguageListener = new OnClickListener() {
|
||||
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
final LanguageSpinnerAdapter adapter = new LanguageSpinnerAdapter(context, android.R.layout.simple_spinner_item, Languages, getLayoutInflater());
|
||||
AlertDialog.Builder builder = new AlertDialog.Builder(context);
|
||||
builder.setTitle(getString(R.string.selLanguage));
|
||||
builder.setAdapter(adapter , (dialog, which) -> {
|
||||
textViewSpinnerLanguage.setText(adapter.getItem(which));
|
||||
switch(which)
|
||||
{
|
||||
case 0: imageLanguage.setImageResource(R.drawable.en); AppParams.LANGUAGETMP = "en"; onCreate(savedInstanceState); parentTab.changeLanguage(); break;
|
||||
case 1: imageLanguage.setImageResource(R.drawable.de); AppParams.LANGUAGETMP = "de"; onCreate(savedInstanceState); parentTab.changeLanguage(); break;
|
||||
case 2: imageLanguage.setImageResource(R.drawable.tr); AppParams.LANGUAGETMP = "tr"; onCreate(savedInstanceState); parentTab.changeLanguage(); break;
|
||||
case 3: imageLanguage.setImageResource(R.drawable.ro); AppParams.LANGUAGETMP = "ro"; onCreate(savedInstanceState); parentTab.changeLanguage(); break;
|
||||
case 4: imageLanguage.setImageResource(R.drawable.ru); AppParams.LANGUAGETMP = "ru"; onCreate(savedInstanceState); parentTab.changeLanguage(); break;
|
||||
case 5: imageLanguage.setImageResource(R.drawable.es); AppParams.LANGUAGETMP = "es"; onCreate(savedInstanceState); parentTab.changeLanguage(); break;
|
||||
builder.setAdapter(adapter , new DialogInterface.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(DialogInterface dialog, int which) {
|
||||
textViewSpinnerLanguage.setText(adapter.getItem(which));
|
||||
switch(which)
|
||||
{
|
||||
case 0: imageLanguage.setImageResource(R.drawable.en); AppParams.LANGUAGETMP = "en"; onCreate(savedInstanceState); parentTab.changeLanguage(); break;
|
||||
case 1: imageLanguage.setImageResource(R.drawable.de); AppParams.LANGUAGETMP = "de"; onCreate(savedInstanceState); parentTab.changeLanguage(); break;
|
||||
case 2: imageLanguage.setImageResource(R.drawable.tr); AppParams.LANGUAGETMP = "tr"; onCreate(savedInstanceState); parentTab.changeLanguage(); break;
|
||||
case 3: imageLanguage.setImageResource(R.drawable.ro); AppParams.LANGUAGETMP = "ro"; onCreate(savedInstanceState); parentTab.changeLanguage(); break;
|
||||
case 4: imageLanguage.setImageResource(R.drawable.ru); AppParams.LANGUAGETMP = "ru"; onCreate(savedInstanceState); parentTab.changeLanguage(); break;
|
||||
case 5: imageLanguage.setImageResource(R.drawable.es); AppParams.LANGUAGETMP = "es"; onCreate(savedInstanceState); parentTab.changeLanguage(); break;
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
|
|
@ -194,12 +215,12 @@ public class SetupActivity extends Activity {
|
|||
String oldIP = AppParams.IP;
|
||||
String oldPort = AppParams.PORT;
|
||||
|
||||
editor.putString("ip", appServerIP.getText().toString());
|
||||
editor.putString("port", appServerPort.getText().toString());
|
||||
editor.putString("language", AppParams.LANGUAGETMP);
|
||||
boolean result = editor.commit();
|
||||
editor.putString("ip", appServerIP.getText().toString());
|
||||
editor.putString("port", appServerPort.getText().toString());
|
||||
editor.putString("language", AppParams.LANGUAGETMP);
|
||||
Boolean result = editor.commit();
|
||||
// saved completed
|
||||
if (result)
|
||||
if(result)
|
||||
Toast.makeText(context, "Settings saved successfully.", Toast.LENGTH_LONG).show();
|
||||
else
|
||||
Toast.makeText(context, "Settings failed to complete!", Toast.LENGTH_LONG).show();
|
||||
|
|
@ -244,4 +265,31 @@ public class SetupActivity extends Activity {
|
|||
//showDialog(result);
|
||||
}
|
||||
|
||||
public void showDialog(Boolean result)
|
||||
{
|
||||
Dialog dialog = new Dialog(context);
|
||||
if(result)
|
||||
dialog.setTitle("Save Completed");
|
||||
else
|
||||
dialog.setTitle("Save Failed");
|
||||
dialog.setContentView(R.layout.dialog);
|
||||
dialog.setCancelable(true);
|
||||
dialog.setCanceledOnTouchOutside(true);
|
||||
|
||||
TextView text = (TextView) dialog.findViewById(R.id.text);
|
||||
ImageView image = (ImageView) dialog.findViewById(R.id.image);
|
||||
if(result)
|
||||
{
|
||||
image.setImageResource(R.drawable.error);
|
||||
text.setText("Settings saved successfully.");
|
||||
}
|
||||
else
|
||||
{
|
||||
image.setImageResource(R.drawable.error);
|
||||
text.setText("Settings failed to complete!");
|
||||
}
|
||||
|
||||
dialog.show();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -60,7 +60,6 @@ import android.annotation.SuppressLint;
|
|||
import android.app.Activity;
|
||||
import android.app.Dialog;
|
||||
import android.app.Notification;
|
||||
import android.app.NotificationChannel;
|
||||
import android.app.NotificationManager;
|
||||
import android.app.PendingIntent;
|
||||
import android.content.BroadcastReceiver;
|
||||
|
|
@ -73,13 +72,8 @@ import android.content.pm.PackageManager;
|
|||
import android.content.res.AssetManager;
|
||||
import android.content.res.Configuration;
|
||||
import android.content.res.Resources;
|
||||
import android.net.ConnectivityManager;
|
||||
import android.net.Network;
|
||||
import android.net.NetworkCapabilities;
|
||||
import android.net.NetworkRequest;
|
||||
import android.net.Uri;
|
||||
import android.os.AsyncTask;
|
||||
import android.os.Build;
|
||||
import android.os.Bundle;
|
||||
import android.os.Handler;
|
||||
import android.os.IBinder;
|
||||
|
|
@ -100,12 +94,9 @@ import android.widget.Toast;
|
|||
import android.widget.TabHost.TabSpec;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.core.app.NotificationCompat;
|
||||
import androidx.core.app.NotificationManagerCompat;
|
||||
|
||||
public class TabLayoutActivity extends AbstractSDParentActivity {
|
||||
|
||||
private final String TAG = "TabLayoutActivity";
|
||||
/* Misc */
|
||||
private Resources res;
|
||||
private Context context;
|
||||
|
|
@ -184,9 +175,6 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
|
|||
private static final String SETTINGS = "Setup";
|
||||
private static final String ABOUT = "SafeMobile";
|
||||
|
||||
private final Handler uiHandler = new Handler(Looper.getMainLooper());
|
||||
|
||||
|
||||
// default app language
|
||||
public static final String DATABASE_LANGUAGE = "en"; // database language : en, de, tr, ro or empty
|
||||
|
||||
|
|
@ -574,59 +562,8 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
|
|||
|
||||
/* Create Service and bind to it */
|
||||
getApplicationContext().bindService(new Intent(this, TCPService.class), serviceConnection, Context.BIND_AUTO_CREATE);
|
||||
|
||||
|
||||
ConnectivityManager connectivityManager =
|
||||
(ConnectivityManager) this.getSystemService(Context.CONNECTIVITY_SERVICE);
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
|
||||
connectivityManager.registerDefaultNetworkCallback(networkCallback);
|
||||
else {
|
||||
NetworkRequest request = new NetworkRequest.Builder()
|
||||
.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET).build();
|
||||
connectivityManager.registerNetworkCallback(request, networkCallback);
|
||||
}
|
||||
}
|
||||
|
||||
private final ConnectivityManager.NetworkCallback networkCallback = new ConnectivityManager.NetworkCallback() {
|
||||
@Override
|
||||
public void onAvailable(Network network) {
|
||||
// network available
|
||||
Log.v(TAG, "network available");
|
||||
Log.v(TAG, "tcp: " + (tcp != null));
|
||||
|
||||
if (tcp != null) {
|
||||
if (tcp.isConnectionUP)
|
||||
tcp.isConnectionUP = false;
|
||||
|
||||
uiHandler.post(() -> {
|
||||
Log.v(TAG, "myService: " + (myService != null));
|
||||
if (myService != null) {
|
||||
myService.stopTCPConnection();
|
||||
myService.recreateTCPConnection();
|
||||
|
||||
getApplicationContext().bindService(new Intent(context, TCPService.class), serviceConnection, Context.BIND_AUTO_CREATE);
|
||||
if (getRadioActivity() != null)
|
||||
getRadioActivity().onCreate(getRadioActivity().getSavedInstanceState());
|
||||
if (getMessageActivity() != null)
|
||||
getMessageActivity().onCreate(getMessageActivity().getSavedInstanceState());
|
||||
if (getRecordingsActivity() != null)
|
||||
getRecordingsActivity().onCreate(getRecordingsActivity().getSavedInstanceState());
|
||||
if (getAlarmActivity() != null)
|
||||
getAlarmActivity().onCreate(getAlarmActivity().getSavedInstanceState());
|
||||
|
||||
uiHandler.post(initTCPRUN);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onLost(Network network) {
|
||||
// network unavailable
|
||||
Log.v(TAG, "network unavailable");
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* Broadcast Received for notifications
|
||||
*/
|
||||
|
|
@ -661,7 +598,6 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
|
|||
Vehicle vehicle = getVehicle4Imei(getImei());
|
||||
if (vehicle != null)
|
||||
getMessageActivity().setScId(vehicle.sc_id);
|
||||
Log.v(TAG, "lastmessages: false");
|
||||
getMessageActivity().LASTMESSAGES = false;
|
||||
getMessageActivity().getLastSMS();
|
||||
|
||||
|
|
@ -754,26 +690,13 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
|
|||
|
||||
@Override
|
||||
public void whenBackPressed(AppParams.ActivityResult result) {
|
||||
try {
|
||||
prepareForLogOut(result);
|
||||
|
||||
finish();
|
||||
android.os.Process.killProcess(android.os.Process.myPid());
|
||||
System.exit(0);
|
||||
} catch (Exception e) {
|
||||
Log.v(TAG, e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
private void prepareForLogOut(AppParams.ActivityResult result) {
|
||||
Log.v(TAG, "prepareForLogOut");
|
||||
if (tcpTimer != null) {
|
||||
tcpTimer.cancel();
|
||||
tcpTimer.purge();
|
||||
tcpTimer = null;
|
||||
}
|
||||
|
||||
if (getRadioActivity() != null && getRadioActivity().audioThread != null) {
|
||||
if (getRadioActivity().audioThread != null) {
|
||||
Thread moribund = getRadioActivity().audioThread;
|
||||
getRadioActivity().audioThread = null;
|
||||
moribund.interrupt();
|
||||
|
|
@ -794,6 +717,10 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
|
|||
|
||||
getIntent().putExtra("result", result);
|
||||
setResult(RESULT_OK, getIntent()); //-> used for exit
|
||||
|
||||
finish();
|
||||
android.os.Process.killProcess(android.os.Process.myPid());
|
||||
System.exit(0);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -801,15 +728,16 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
|
|||
// recreate UI
|
||||
Locale locale = new Locale(AppParams.LANGUAGETMP);
|
||||
Locale.setDefault(locale);
|
||||
setLocale(getLiveActivity(), locale);
|
||||
android.content.res.Configuration configuration = new android.content.res.Configuration();
|
||||
configuration.locale = locale;
|
||||
getBaseContext().getResources().updateConfiguration(configuration,
|
||||
getBaseContext().getResources().getDisplayMetrics());
|
||||
|
||||
// change UI for RadioActivity and MessageActivity
|
||||
if (getLiveActivity() != null)
|
||||
getLiveActivity().setLanguage();
|
||||
if (getHistoryActivity() != null)
|
||||
getHistoryActivity().setLanguage();
|
||||
getHistoryActivity().onCreate(getHistoryActivity().savedInstanceState);
|
||||
// change UI for RadioActivity and MessageActivity
|
||||
if (getRadioActivity() != null)
|
||||
getRadioActivity().onCreate(getRadioActivity().getSavedInstanceState());
|
||||
getRadioActivity().onCreate(getRadioActivity().savedInstanceState);
|
||||
if (getMessageActivity() != null)
|
||||
getMessageActivity().onCreate(getMessageActivity().getSavedInstanceState());
|
||||
if (getRecordingsActivity() != null)
|
||||
|
|
@ -818,13 +746,6 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
|
|||
getAlarmActivity().onCreate(getAlarmActivity().getSavedInstanceState());
|
||||
}
|
||||
|
||||
public static void setLocale(Activity activity, Locale locale) {
|
||||
Resources resources = activity.getResources();
|
||||
Configuration config = resources.getConfiguration();
|
||||
config.setLocale(locale);
|
||||
resources.updateConfiguration(config, resources.getDisplayMetrics());
|
||||
}
|
||||
|
||||
//timer stuff
|
||||
private void timerMethod() {
|
||||
if (!AppParams.DEMO)
|
||||
|
|
@ -1300,8 +1221,7 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
|
|||
image.setImageResource(AppParams.DEMO ? R.drawable.icon_demo : R.mipmap.ic_launcher);
|
||||
TextView text = dialog.findViewById(R.id.text);
|
||||
TextView text2 = dialog.findViewById(R.id.text2);
|
||||
text.setText(getString(R.string.version) + " " + BuildConfig.VERSION_NAME);
|
||||
|
||||
text.setText(String.format("%s1.0.8", getString(R.string.version)));
|
||||
text2.setText(String.format("%s: support@safemobile.com", getString(R.string.email)));
|
||||
dialog.setCancelable(true);
|
||||
dialog.setCanceledOnTouchOutside(true);
|
||||
|
|
@ -1937,70 +1857,75 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
|
|||
SM.Debug("Unit imei:" + tempArr[0]);
|
||||
String unitIMEI = tempArr[0];
|
||||
|
||||
// change Visual Elements
|
||||
setImei(unitIMEI);
|
||||
switch (msg.opCode) {
|
||||
case 135:
|
||||
setMess("speed " + tempArr[1]);
|
||||
break;
|
||||
case 136:
|
||||
setMess("landmark " + tempArr[1]);
|
||||
break;
|
||||
case 137:
|
||||
setMess("zone " + tempArr[1]);
|
||||
break;
|
||||
case 138:
|
||||
setMess("emergency");
|
||||
break;
|
||||
case 140:
|
||||
setMess("telemetry " + tempArr[1]);
|
||||
break;
|
||||
default:
|
||||
setMess("emergency");
|
||||
}
|
||||
myHandler.post(updateResultsAlarm);
|
||||
|
||||
//============
|
||||
// live tab
|
||||
//============
|
||||
|
||||
if ((msg.opCode == 138) && (AppParams.crtTab == AppParams.Tabs.live)) {
|
||||
SuperVehicle superVehicle = getSuperVehHash().get(Long.parseLong(unitIMEI));
|
||||
|
||||
if (superVehicle != null) {
|
||||
|
||||
//if is not check i need to force check to put on the map
|
||||
boolean forceChecked = false;
|
||||
if (!superVehicle.needUpdate) {
|
||||
superVehicle.needUpdate = true;
|
||||
forceChecked = true;
|
||||
}
|
||||
|
||||
try {
|
||||
int x = 0;
|
||||
if (forceChecked) {
|
||||
for (Vehicle veh : getAllVehicle()) {
|
||||
if (veh.imei.compareTo(unitIMEI) == 0) break;
|
||||
x++;
|
||||
}
|
||||
} else x = -1;
|
||||
if (getLiveActivity() != null) {
|
||||
if (x != getAllVehicle().size())
|
||||
getLiveActivity().emergencyAlarmReceived(x, superVehicle.lat, superVehicle.lng);
|
||||
else
|
||||
getLiveActivity().emergencyAlarmReceived(-1, superVehicle.lat, superVehicle.lng);
|
||||
}
|
||||
} catch (Exception ex) {
|
||||
SM.Debug(HASH_ERROR_MESSAGE + ex);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//list for SMS
|
||||
//==============
|
||||
// alarms tab
|
||||
//==============
|
||||
if (AppParams.crtTab == AppParams.Tabs.alarms) {
|
||||
SM.Debug("currentActivity instanceof AlarmActivity - newSMS | " + tempArr[0] + " | " + tempArr[1]);
|
||||
getAlarms(AppParams.USERID);
|
||||
}
|
||||
|
||||
// if tab is not TextTab
|
||||
if (tabHost.getCurrentTab() != 5 /* Text tab */) {
|
||||
// change Visual Elements
|
||||
setImei(unitIMEI);
|
||||
switch (msg.opCode) {
|
||||
case 135:
|
||||
setMess("speed " + tempArr[1]);
|
||||
break;
|
||||
case 136:
|
||||
setMess("landmark " + tempArr[1]);
|
||||
break;
|
||||
case 137:
|
||||
setMess("zone " + tempArr[1]);
|
||||
break;
|
||||
case 138:
|
||||
setMess("emergency");
|
||||
break;
|
||||
case 140:
|
||||
setMess("telemetry " + tempArr[1]);
|
||||
break;
|
||||
default:
|
||||
setMess("emergency");
|
||||
}
|
||||
myHandler.post(updateResultsAlarm);
|
||||
|
||||
//============
|
||||
// live tab
|
||||
//============
|
||||
|
||||
if ((msg.opCode == 138) && (AppParams.crtTab == AppParams.Tabs.live)) {
|
||||
SuperVehicle superVehicle = getSuperVehHash().get(Long.parseLong(unitIMEI));
|
||||
|
||||
if (superVehicle != null) {
|
||||
|
||||
//if is not check i need to force check to put on the map
|
||||
boolean forceChecked = false;
|
||||
if (!superVehicle.needUpdate) {
|
||||
superVehicle.needUpdate = true;
|
||||
forceChecked = true;
|
||||
}
|
||||
|
||||
try {
|
||||
int x = 0;
|
||||
if (forceChecked) {
|
||||
for (Vehicle veh : getAllVehicle()) {
|
||||
if (veh.imei.compareTo(unitIMEI) == 0) break;
|
||||
x++;
|
||||
}
|
||||
} else x = -1;
|
||||
if (getLiveActivity() != null) {
|
||||
if (x != getAllVehicle().size())
|
||||
getLiveActivity().emergencyAlarmReceived(x, superVehicle.lat, superVehicle.lng);
|
||||
else
|
||||
getLiveActivity().emergencyAlarmReceived(-1, superVehicle.lat, superVehicle.lng);
|
||||
}
|
||||
} catch (Exception ex) {
|
||||
SM.Debug(HASH_ERROR_MESSAGE + ex);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -2106,53 +2031,11 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
|
|||
|
||||
@Override
|
||||
public void onTCPConnectionDown(boolean previousWasConnectionUp) {
|
||||
Timer timer = new Timer();
|
||||
timer.schedule(new TimerTask() {
|
||||
@Override
|
||||
public void run() {
|
||||
boolean isNetworkConnected = isNetworkConnected();
|
||||
Log.v(TAG, "isNetworkConnected: " + isNetworkConnected);
|
||||
if (isNetworkConnected) {
|
||||
if (tcp != null && !tcp.isConnectionUP) {
|
||||
tcp.Stop();
|
||||
// if (tcpParser != null)
|
||||
// tcpParser.clearMsgList();
|
||||
tcp = null;
|
||||
|
||||
uiHandler.post(() -> {
|
||||
if (myService != null) {
|
||||
myService.stopTCPConnection();
|
||||
|
||||
|
||||
myService.recreateTCPConnection();
|
||||
|
||||
getApplicationContext().bindService(new Intent(context, TCPService.class), serviceConnection, Context.BIND_AUTO_CREATE);
|
||||
if (getRadioActivity() != null)
|
||||
getRadioActivity().onCreate(getRadioActivity().getSavedInstanceState());
|
||||
if (getMessageActivity() != null)
|
||||
getMessageActivity().onCreate(getMessageActivity().getSavedInstanceState());
|
||||
if (getRecordingsActivity() != null)
|
||||
getRecordingsActivity().onCreate(getRecordingsActivity().getSavedInstanceState());
|
||||
if (getAlarmActivity() != null)
|
||||
getAlarmActivity().onCreate(getAlarmActivity().getSavedInstanceState());
|
||||
|
||||
uiHandler.post(initTCPRUN);
|
||||
}
|
||||
SM.Debug("RECREATE TCP", "IP: " + AppParams.IP + " | Port: " + AppParams.PORT);
|
||||
});
|
||||
}
|
||||
|
||||
this.cancel();
|
||||
}
|
||||
}
|
||||
}, 0, 100);
|
||||
|
||||
prepareForLogOut(AppParams.ActivityResult.tcpDown);
|
||||
// execute logout
|
||||
// whenBackPressed(AppParams.ActivityResult.tcpDown);
|
||||
whenBackPressed(AppParams.ActivityResult.tcpDown);
|
||||
|
||||
// send a broadcast
|
||||
// notifyBroadcast(OperationCodes.TCP_CONNECTION_DOWN + "");
|
||||
notifyBroadcast(OperationCodes.TCP_CONNECTION_DOWN + "");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -2173,19 +2056,6 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
|
|||
});
|
||||
}
|
||||
|
||||
// Create runnable for posting
|
||||
final Runnable initTCPRUN = () -> {
|
||||
// start thread to add listener
|
||||
SM.Debug("##### initTCPRUN");
|
||||
if (!AppParams.DEMO)
|
||||
tcpInit();
|
||||
};
|
||||
|
||||
private boolean isNetworkConnected() {
|
||||
ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
|
||||
return cm.getActiveNetworkInfo() != null && cm.getActiveNetworkInfo().isConnected();
|
||||
}
|
||||
|
||||
// Create runnable for posting
|
||||
final Runnable updateResultsAlarm = () -> updateResultsAlarmInUi("realpha");
|
||||
|
||||
|
|
@ -2341,56 +2211,23 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
|
|||
|
||||
Notification notification = new Notification(icon, tickerText, System.currentTimeMillis());
|
||||
|
||||
// set intent to be opened on NotificationClick
|
||||
/* Notification */
|
||||
Intent notificationIntent = new Intent(this, NotificationActivity.class);
|
||||
notificationIntent.putExtra("key", iconValue);
|
||||
|
||||
// cancel old notification
|
||||
mNotificationManager.cancel(icon);
|
||||
|
||||
PendingIntent contentIntent = PendingIntent.getActivity(context, NOTIFICATION_ACTIVITY_RESULT, notificationIntent, PendingIntent.FLAG_CANCEL_CURRENT);
|
||||
|
||||
// flag that the notification will be closed when clicked
|
||||
notification.flags |= Notification.FLAG_AUTO_CANCEL;
|
||||
notification.number = 1; // the same notification will be shown;
|
||||
notification.tickerText = tickerText; // notification text when arrives
|
||||
notification.sound = Uri.parse("android.resource://" + getPackageName() + "/" + R.raw.new_sms);
|
||||
|
||||
|
||||
Intent intent = new Intent(this, NotificationActivity.class);
|
||||
intent.putExtra("key", iconValue);
|
||||
|
||||
// cancel old notification
|
||||
mNotificationManager.cancel(icon);
|
||||
|
||||
PendingIntent pendingIntent;
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
|
||||
pendingIntent = PendingIntent.getActivity(context, NOTIFICATION_ACTIVITY_RESULT, intent, PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE);
|
||||
|
||||
}else {
|
||||
pendingIntent = PendingIntent.getActivity(context, NOTIFICATION_ACTIVITY_RESULT, intent, PendingIntent.FLAG_CANCEL_CURRENT);
|
||||
|
||||
}
|
||||
|
||||
|
||||
createNotificationChannel(icon, contentTitle, contentText, pendingIntent);
|
||||
}
|
||||
|
||||
private void createNotificationChannel(int icon, String title, String text, PendingIntent pendingIntent) {
|
||||
// Create the NotificationChannel, but only on API 26+ because
|
||||
// the NotificationChannel class is new and not in the support library
|
||||
String notificationChannelID = String.valueOf(icon);
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
|
||||
CharSequence name = "Notification Channel";
|
||||
int importance = NotificationManager.IMPORTANCE_HIGH;
|
||||
NotificationChannel channel = new NotificationChannel(notificationChannelID, name, importance);
|
||||
// Register the channel with the system; you can't change the importance
|
||||
// or other notification behaviors after this
|
||||
NotificationManager notificationManager = getSystemService(NotificationManager.class);
|
||||
notificationManager.createNotificationChannel(channel);
|
||||
}
|
||||
|
||||
NotificationCompat.Builder builder = new NotificationCompat.Builder(context, notificationChannelID)
|
||||
.setSmallIcon(icon)
|
||||
.setContentTitle(title)
|
||||
.setContentText(text)
|
||||
.setPriority(NotificationCompat.PRIORITY_DEFAULT)
|
||||
.setAutoCancel(true)
|
||||
.setContentIntent(pendingIntent);
|
||||
|
||||
NotificationManagerCompat managerCompat = NotificationManagerCompat.from(context);
|
||||
managerCompat.notify(icon, builder.build());
|
||||
// add notification to the manager
|
||||
mNotificationManager.notify(icon, notification);
|
||||
}
|
||||
|
||||
// return vehicle according to imei
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@
|
|||
android:gravity="center_vertical" >
|
||||
|
||||
<TextView
|
||||
android:id="@+id/unit_name"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/unitName"
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user