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

merge with develop

This commit is contained in:
CiufudeanDani 2022-03-28 14:06:36 +03:00
parent 9b302d0461 e80272e0a4
commit 17a7e1711e
33 changed files with 2739 additions and 2490 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libSafeMobile/build.gradle
View File

@ -19,6 +19,13 @@ android {
buildFeatures {
viewBinding false
}
lintOptions {
checkReleaseBuilds false
// Or, if you prefer, you can continue to check for errors in release builds,
// but continue the build even when errors are found:
//abortOnError false
}
}
dependencies {

10
libSafeMobile/src/main/java/com/safemobile/enums/AuthorizationCode.java Normal file
View File

@ -0,0 +1,10 @@
package com.safemobile.enums;
public enum AuthorizationCode {
UNKNOWN,
RECORD_AUDIO,
CAMERA,
GEOLOCATION,
READ_EXTERNAL_STORAGE,
WRITE_EXTERNAL_STORAGE
}

7
libSafeMobile/src/main/java/com/safemobile/enums/AuthorizationStatus.java Normal file
View File

@ -0,0 +1,7 @@
package com.safemobile.enums;
public enum AuthorizationStatus {
AUTHORIZE,
DENIED,
NOT_DETERMINED
}

6
libSafeMobile/src/main/java/com/safemobile/enums/ProviderSettingsStatus.java Normal file
View File

@ -0,0 +1,6 @@
package com.safemobile.enums;
public enum ProviderSettingsStatus {
APPLICATION_DETAILS,
SETTINGS
}

37
libSafeMobile/src/main/java/com/safemobile/helpers/ProviderSettingsHelper.java Normal file
View File

@ -0,0 +1,37 @@
package com.safemobile.helpers;
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.provider.Settings;
import com.safemobile.enums.ProviderSettingsStatus;
public class ProviderSettingsHelper {
public static final String PACKAGE = "package";
public static final String ACTION_APPLICATION_DETAILS_SETTINGS = Settings.ACTION_APPLICATION_DETAILS_SETTINGS;
public static final String ACTION_SETTINGS = Settings.ACTION_SETTINGS;
private ProviderSettingsHelper() {
}
public static String getAction(ProviderSettingsStatus providerSettingsStatus) {
switch (providerSettingsStatus) {
case APPLICATION_DETAILS:
return ACTION_APPLICATION_DETAILS_SETTINGS;
case SETTINGS:
default:
return ACTION_SETTINGS;
}
}
public static boolean canHandleAction(Context context, String action) {
Intent intent = new Intent(action);
Uri uri = Uri.fromParts(PACKAGE, context.getPackageName(), null);
intent.setData(uri);
return context.getPackageManager() != null && intent.resolveActivity(context.getPackageManager()) != null;
}
}

12
libSafeMobile/src/main/java/com/safemobile/interfaces/IDialogService.java Normal file
View File

@ -0,0 +1,12 @@
package com.safemobile.interfaces;
import android.app.Activity;
import com.google.android.gms.tasks.Task;
public interface IDialogService {
Task<Boolean> showDialog(Activity activity, String title, String message, String cancel, String ok);
Task<Boolean> showPermissionRequestDialog(Activity activity, String message, String cancel);
void showError(Activity activity, String message);
}

11
libSafeMobile/src/main/java/com/safemobile/interfaces/IPermissionModule.java Normal file
View File

@ -0,0 +1,11 @@
package com.safemobile.interfaces;
import android.app.Activity;
import com.safemobile.enums.AuthorizationCode;
import com.safemobile.enums.AuthorizationStatus;
public interface IPermissionModule {
AuthorizationStatus getAuthorizationStatus(Activity activity, AuthorizationCode authorizationCode);
void requestAuthorization(Activity activity, AuthorizationCode authorizationCode);
}

8
libSafeMobile/src/main/java/com/safemobile/interfaces/ITCPListener.java
View File

@ -16,7 +16,7 @@ public interface ITCPListener {
public void onHistoryPositionsCountReceived( TCPEvent event );
public void onAlarmsReceived( TCPEvent event );
public void onAlarmAckReceived(TCPEvent event);
public void alarmLiveRecv(TCPEvent event);
public void alarmLiveReceived(TCPEvent event);
public void onRecordingPlayReceived(TCPEvent event);
public void onPollReceived(TCPEvent event);
@ -27,7 +27,7 @@ public interface ITCPListener {
public void onRecordingsListReceived(TCPEvent event);
public void onPONGReceived();
public void onTCPConnectionDown(boolean previuosWasConnectionUp);
public void onTCPConnectionUp(boolean previuosWasConnectionUp);
public void onTCPConnectionStatusReceived(boolean isConnectionUp, boolean previuosWasConnectionUp);
public void onTCPConnectionDown(boolean previousWasConnectionUp);
public void onTCPConnectionUp(boolean previousWasConnectionUp);
public void onTCPConnectionStatusReceived(boolean isConnectionUp, boolean previousWasConnectionUp);
}

2
libSafeMobile/src/main/java/com/safemobile/lib/AppParams.java
View File

@ -27,7 +27,7 @@ public class AppParams {
/* SafeMobile Dispatch */
public static ArrayList<User> allUsers = new ArrayList<User>();
public static Theme theme = Theme.SAFENET; // the Theme type
public static Theme theme = Theme.SAFEDISPATCH; // the Theme type
/* ***************************************** */

3
libSafeMobile/src/main/java/com/safemobile/services/TCPmsgParser.java
View File

@ -10,7 +10,6 @@ import com.safemobile.interfaces.TCPEvent;
import com.safemobile.lib.OperationCodes;
import com.safemobile.lib.SM;
import com.safemobile.lib.TCPmsg;
import com.safemobile.services.TCPhandler;
public class TCPmsgParser implements Runnable{
@ -150,7 +149,7 @@ public class TCPmsgParser implements Runnable{
TCPEvent event = new TCPEvent( this, _msg );
Iterator<ITCPListener> listeners = _listeners.iterator();
while( listeners.hasNext() ) {
( (ITCPListener) listeners.next() ).alarmLiveRecv(event);
( (ITCPListener) listeners.next() ).alarmLiveReceived(event);
}
}

9
safeDispatch/build.gradle
View File

@ -25,7 +25,7 @@ android {
buildToolsVersion "31.0.0"
defaultConfig {
applicationId "com.safemobile.dispatch"
applicationId "com.safemobile.safedispatch"
minSdkVersion 21
targetSdkVersion 31
versionName androidGitVersion.name()
@ -42,6 +42,13 @@ android {
buildFeatures {
viewBinding false
}
lintOptions {
checkReleaseBuilds false
// Or, if you prefer, you can continue to check for errors in release builds,
// but continue the build even when errors are found:
//abortOnError false
}
}
dependencies {
implementation project(':libSafeMobile')

BIN
safeDispatch/release/SafeDispatchMobile_v.8.0.35-release.aab Normal file
View File

Binary file not shown.

20
safeDispatch/release/output-metadata.json Normal file
View 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"
}

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

@ -1,19 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.safemobile.dispatch">
package="com.safemobile.safedispatch">
<!-- require OpenGL ES version 2 for Google Maps -->
<uses-feature
android:glEsVersion="0x00020000"
android:required="true" />
<uses-permission android:name="android.permission.CAMERA" />
<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" />
<uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.READ_GSERVICES" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-feature android:name="android.hardware.camera" />
<uses-feature
@ -40,7 +42,7 @@
<service android:name="com.safemobile.services.TCPService" />
<activity
android:name=".SDMobileActivity"
android:name="com.safemobile.safedispatch.SDMobileActivity"
android:configChanges="orientation"
android:exported="true"
android:label="@string/app_name_demo"
@ -52,41 +54,41 @@
</intent-filter>
</activity>
<activity
android:name=".SetupActivity"
android:name="com.safemobile.safedispatch.SetupActivity"
android:configChanges="orientation"
android:screenOrientation="landscape" />
<activity
android:name=".TabLayoutActivity"
android:name="com.safemobile.safedispatch.TabLayoutActivity"
android:configChanges="orientation"
android:screenOrientation="landscape" />
<activity
android:name=".LiveActivity"
android:name="com.safemobile.safedispatch.LiveActivity"
android:exported="false"
android:configChanges="orientation"
android:screenOrientation="landscape"
android:label="@string/title_activity_google_maps" />
<activity
android:name=".HistoryActivity"
android:name="com.safemobile.safedispatch.HistoryActivity"
android:configChanges="orientation"
android:screenOrientation="landscape" />
<activity
android:name=".MessagesActivity"
android:name="com.safemobile.safedispatch.MessagesActivity"
android:configChanges="orientation"
android:screenOrientation="landscape" />
<activity
android:name=".AlarmActivity"
android:name="com.safemobile.safedispatch.AlarmActivity"
android:configChanges="orientation"
android:screenOrientation="landscape" />
<activity
android:name=".RadioActivity"
android:name="com.safemobile.safedispatch.RadioActivity"
android:configChanges="orientation"
android:screenOrientation="landscape" />
<activity
android:name=".RecordingsActivity"
android:name="com.safemobile.safedispatch.RecordingsActivity"
android:configChanges="orientation"
android:screenOrientation="landscape" />
<activity
android:name=".NotificationActivity"
android:name="com.safemobile.safedispatch.NotificationActivity"
android:configChanges="orientation"
android:screenOrientation="landscape" />
</application>

2352
safeDispatch/src/main/java/com/safemobile/dispatch/TabLayoutActivity.java
View File

File diff suppressed because it is too large Load Diff

50
safeDispatch/src/main/java/com/safemobile/lib/DialogService.java Normal file
View File

@ -0,0 +1,50 @@
package com.safemobile.lib;
import android.app.Activity;
import android.app.AlertDialog;
import com.google.android.gms.tasks.Task;
import com.google.android.gms.tasks.TaskCompletionSource;
import com.safemobile.safedispatch.R;
import com.safemobile.interfaces.IDialogService;
public class DialogService implements IDialogService {
@Override
public Task<Boolean> showDialog(Activity activity, String title, String message, String cancel, String ok) {
TaskCompletionSource<Boolean> taskCompletionSource = new TaskCompletionSource<>();
AlertDialog.Builder builder = new AlertDialog.Builder(activity)
.setTitle(title)
.setMessage(message)
.setCancelable(false)
.setNegativeButton(cancel, (dialog, which) -> {
taskCompletionSource.trySetResult(false);
dialog.dismiss();
})
.setPositiveButton(ok, (dialog, which) -> taskCompletionSource.trySetResult(true));
AlertDialog dialog = builder.create();
dialog.show();
return taskCompletionSource.getTask();
}
@Override
public Task<Boolean> showPermissionRequestDialog(Activity activity, String message, String cancel) {
return showDialog(
activity,
activity.getString(R.string.permission_denied),
message,
cancel,
activity.getString(R.string.go_to_settings));
}
@Override
public void showError(Activity activity, String message) {
showDialog(
activity,
activity.getString(R.string.DialogService_Info_ErrorMessage),
message,
null,
activity.getString(R.string.ok));
}
}

97
safeDispatch/src/main/java/com/safemobile/lib/PermissionModule.java Normal file
View File

@ -0,0 +1,97 @@
package com.safemobile.lib;
import android.Manifest;
import android.app.Activity;
import android.content.pm.PackageManager;
import androidx.core.app.ActivityCompat;
import androidx.core.content.ContextCompat;
import com.safemobile.enums.AuthorizationCode;
import com.safemobile.enums.AuthorizationStatus;
import com.safemobile.interfaces.IPermissionModule;
import java.security.InvalidParameterException;
public class PermissionModule implements IPermissionModule {
private static final String[] AUDIO_PERMISSIONS = {Manifest.permission.RECORD_AUDIO};
private static final String[] LOCATION_PERMISSIONS = {
Manifest.permission.ACCESS_COARSE_LOCATION,
Manifest.permission.ACCESS_FINE_LOCATION
};
private static final String[] CAMERA_PERMISSIONS = {Manifest.permission.CAMERA};
private static final String[] READ_EXTERNAL_STORAGE_PERMISSIONS = {Manifest.permission.READ_EXTERNAL_STORAGE};
private static final String[] WRITE_EXTERNAL_STORAGE_PERMISSIONS = {Manifest.permission.WRITE_EXTERNAL_STORAGE};
public static final int RECORD_AUDIO_PERMISSION_REQUEST_CODE = 13042022;
public static final int LOCATION_PERMISSION_REQUEST_CODE = 12021990;
public static final int CAMERA_PERMISSION_REQUEST_CODE = 16031989;
public static final int READ_STORAGE_PERMISSION_REQUEST_CODE = 30062018;
public static final int WRITE_STORAGE_PERMISSION_REQUEST_CODE = 13122012;
private boolean permissionPrompShowed;
@Override
public AuthorizationStatus getAuthorizationStatus(Activity activity, AuthorizationCode authorizationCode) {
switch (authorizationCode) {
case RECORD_AUDIO:
return getPermissionAuthorizationStatus(activity, Manifest.permission.RECORD_AUDIO);
case CAMERA:
return getPermissionAuthorizationStatus(activity, Manifest.permission.CAMERA);
case GEOLOCATION:
return getPermissionAuthorizationStatus(activity, Manifest.permission.ACCESS_COARSE_LOCATION);
case READ_EXTERNAL_STORAGE:
return getPermissionAuthorizationStatus(activity, Manifest.permission.READ_EXTERNAL_STORAGE);
case WRITE_EXTERNAL_STORAGE:
return getPermissionAuthorizationStatus(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE);
case UNKNOWN:
throw new InvalidParameterException(authorizationCode.name());
default:
throw new IllegalArgumentException(authorizationCode.name());
}
}
@Override
public void requestAuthorization(Activity activity, AuthorizationCode authorizationCode) {
switch (authorizationCode) {
case RECORD_AUDIO:
ActivityCompat.requestPermissions(activity, AUDIO_PERMISSIONS, RECORD_AUDIO_PERMISSION_REQUEST_CODE);
break;
case CAMERA:
ActivityCompat.requestPermissions(activity, CAMERA_PERMISSIONS, CAMERA_PERMISSION_REQUEST_CODE);
break;
case GEOLOCATION:
ActivityCompat.requestPermissions(activity, LOCATION_PERMISSIONS, LOCATION_PERMISSION_REQUEST_CODE);
break;
case READ_EXTERNAL_STORAGE:
ActivityCompat.requestPermissions(activity, READ_EXTERNAL_STORAGE_PERMISSIONS, READ_STORAGE_PERMISSION_REQUEST_CODE);
break;
case WRITE_EXTERNAL_STORAGE:
ActivityCompat.requestPermissions(activity, WRITE_EXTERNAL_STORAGE_PERMISSIONS, WRITE_STORAGE_PERMISSION_REQUEST_CODE);
break;
case UNKNOWN:
throw new InvalidParameterException(authorizationCode.name());
default:
throw new IllegalArgumentException(authorizationCode.name());
}
permissionPrompShowed = true;
}
private AuthorizationStatus getPermissionAuthorizationStatus(Activity activity, String permission) {
int permissionState = ContextCompat.checkSelfPermission(activity.getApplicationContext(), permission);
return authorizationStatus(activity, permissionState);
}
private AuthorizationStatus authorizationStatus(Activity activity, int permissionState) {
if (permissionState == PackageManager.PERMISSION_GRANTED)
return AuthorizationStatus.AUTHORIZE;
if (!permissionPrompShowed)
return AuthorizationStatus.NOT_DETERMINED;
boolean shouldShowPermissionPrompt = ActivityCompat.shouldShowRequestPermissionRationale(activity, Manifest.permission.ACCESS_COARSE_LOCATION);
return shouldShowPermissionPrompt ? AuthorizationStatus.NOT_DETERMINED : AuthorizationStatus.DENIED;
}
}

4
safeDispatch/src/main/java/com/safemobile/dispatch/AlarmActivity.java → safeDispatch/src/main/java/com/safemobile/safedispatch/AlarmActivity.java
View File

@ -1,4 +1,4 @@
package com.safemobile.dispatch;
package com.safemobile.safedispatch;
import java.util.ArrayList;
import java.util.Locale;
@ -76,7 +76,7 @@ public class AlarmActivity extends Activity {
textView1.setTypeface(Typeface.createFromAsset(getAssets(), "Sketch_Block.ttf"));
textView1.setTextSize(24);
getParentTab().alarmActivity = this;
getParentTab().setAlarmActivity(this);
}
@Override

2
safeDispatch/src/main/java/com/safemobile/dispatch/GoogleMapsInfoBubble.java → safeDispatch/src/main/java/com/safemobile/safedispatch/GoogleMapsInfoBubble.java
View File

@ -1,4 +1,4 @@
package com.safemobile.dispatch;
package com.safemobile.safedispatch;
import android.content.Context;
import android.util.Log;

20
safeDispatch/src/main/java/com/safemobile/dispatch/HistoryActivity.java → safeDispatch/src/main/java/com/safemobile/safedispatch/HistoryActivity.java
View File

@ -1,4 +1,4 @@
package com.safemobile.dispatch;
package com.safemobile.safedispatch;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
@ -60,7 +60,7 @@ public class HistoryActivity extends AppCompatActivity implements OnMapReadyCall
setContentView(R.layout.tabhistory);
parentTab = (TabLayoutActivity) getParent();
parentTab.historyActivity = this;
parentTab.setHistoryActivity(this);
Locale locale = new Locale(AppParams.LANGUAGETMP);
Locale.setDefault(locale);
@ -85,17 +85,17 @@ public class HistoryActivity extends AppCompatActivity implements OnMapReadyCall
displayButton.setOnClickListener(view -> {
googleMap.clear();
if (!AppParams.DEMO) {
parentTab.dropAllData =false;
parentTab.firstHistData = true;
parentTab.HistMsgList.clear();
parentTab.HistPosList.clear();
parentTab.setDropAllData(false);
parentTab.setFirstHistoryData(true);
parentTab.clearHistoryMessageList();
parentTab.clearHistoryPositionList();
// request history
parentTab.executeNetworkStuff(new String[] {OperationCodes.GetHistoryPositions + "", allVehicle.get(spinnerVehicle.getSelectedItemPosition()).sc_id + "",
(startDate.getTime()/ 1000L) + "", (endDate.getTime()/ 1000L) + ""});
} else {
parentTab.demoPositionsList();
displayHistory(parentTab.demoPositions);
displayHistory(parentTab.getDemoPositions());
}
});
@ -204,10 +204,10 @@ public class HistoryActivity extends AppCompatActivity implements OnMapReadyCall
final Runnable UpdateMapResults = new Runnable() {
public void run() {
Log.v("updateMap", parentTab.HistPosList.toString());
Log.v("updateMap", parentTab.getHistoryPositionList().toString());
SM.Debug("Do the Display");
infoBubble.setHistoryPositions(parentTab.HistPosList);
displayHistory(parentTab.HistPosList);
infoBubble.setHistoryPositions(parentTab.getHistoryPositionList());
displayHistory(parentTab.getHistoryPositionList());
}
};

2
safeDispatch/src/main/java/com/safemobile/dispatch/IconContextMenu.java → safeDispatch/src/main/java/com/safemobile/safedispatch/IconContextMenu.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.safemobile.dispatch;
package com.safemobile.safedispatch;
import java.util.ArrayList;

4
safeDispatch/src/main/java/com/safemobile/dispatch/LiveActivity.java → safeDispatch/src/main/java/com/safemobile/safedispatch/LiveActivity.java
View File

@ -1,4 +1,4 @@
package com.safemobile.dispatch;
package com.safemobile.safedispatch;
import android.app.Activity;
import android.app.AlertDialog;
@ -112,7 +112,7 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
// get parentTab
setParentTab((AbstractSDParentActivity) getParent());
try {
((TabLayoutActivity) getParentTab()).liveActivity = this;
((TabLayoutActivity) getParentTab()).setLiveActivity(this);
} catch (Exception ignored) {
// ignored
}

2
safeDispatch/src/main/java/com/safemobile/dispatch/MapDemo.java → safeDispatch/src/main/java/com/safemobile/safedispatch/MapDemo.java
View File

@ -1,4 +1,4 @@
package com.safemobile.dispatch;
package com.safemobile.safedispatch;
import android.os.Bundle;
import androidx.fragment.app.FragmentActivity;

4
safeDispatch/src/main/java/com/safemobile/dispatch/MessagesActivity.java → safeDispatch/src/main/java/com/safemobile/safedispatch/MessagesActivity.java
View File

@ -1,4 +1,4 @@
package com.safemobile.dispatch;
package com.safemobile.safedispatch;
import android.app.Activity;
import android.app.AlertDialog;
@ -215,7 +215,7 @@ public class MessagesActivity extends Activity {
gridView.setId(1); // id needed for IconContextMenu
registerForContextMenu(gridView);
parentTab.messageActivity = this;
parentTab.setMessageActivity(this);
}
// Create runnable for posting

2
safeDispatch/src/main/java/com/safemobile/dispatch/NotificationActivity.java → safeDispatch/src/main/java/com/safemobile/safedispatch/NotificationActivity.java
View File

@ -1,4 +1,4 @@
package com.safemobile.dispatch;
package com.safemobile.safedispatch;
import android.app.Activity;
import android.content.Intent;

84
safeDispatch/src/main/java/com/safemobile/dispatch/RadioActivity.java → safeDispatch/src/main/java/com/safemobile/safedispatch/RadioActivity.java
View File

@ -1,4 +1,4 @@
package com.safemobile.dispatch;
package com.safemobile.safedispatch;
import android.app.Activity;
import android.app.AlertDialog;
@ -236,7 +236,7 @@ public class RadioActivity extends Activity {
}
// send current activity to parrent
parentTab.radioActivity = this;
parentTab.setRadioActivity(this);
// register to be notified when an event is triggered
registerBroadcastIntents();
@ -315,10 +315,10 @@ public class RadioActivity extends Activity {
if(!pttONoff)
{
String chanMsg = "", statMsg = "";
if(parentTab.crtRadio!= null)
SendPTT(selectedCallType, selectedID,parentTab.crtRadio.GW_ID, parentTab.crtRadio.ID,AppParams.USERID);
if(parentTab.getCrtRadio() != null)
SendPTT(selectedCallType, selectedID, parentTab.getCrtRadio().GW_ID, parentTab.getCrtRadio().ID,AppParams.USERID);
// flag in Call
parentTab.inCall = true;
parentTab.setInCall(true);
pttONoff= true;
if(audioH!=null)
audioH.soundNeeded = true;
@ -381,7 +381,7 @@ public class RadioActivity extends Activity {
{
String chanMsg = "", statMsg = "";
if(!AppParams.DEMO)
SendPTT(selectedCallType+10, 1,parentTab.crtRadio.GW_ID, parentTab.crtRadio.ID,AppParams.USERID);
SendPTT(selectedCallType+10, 1, parentTab.getCrtRadio().GW_ID, parentTab.getCrtRadio().ID,AppParams.USERID);
pttONoff= false;
if(audioH!=null)
audioH.soundNeeded = false;
@ -417,7 +417,7 @@ public class RadioActivity extends Activity {
@Override
public void onClick(View v) {
if(parentTab.crtRadio!=null)
if(parentTab.getCrtRadio() !=null)
{
// display dialog with adapter
ArrayList<String> tmp = new ArrayList<String>();
@ -438,7 +438,7 @@ public class RadioActivity extends Activity {
//textViewChannel.setText(crtChannels.get(which).chName);
// send change to App
onZoneCHChange(parentTab.crtRadio.ID, parentTab.crtRadio.GW_ID, getNR4Zone(textViewZone.getText().toString()), getNR4CH(crtChannels.get(which).chName));
onZoneCHChange(parentTab.getCrtRadio().ID, parentTab.getCrtRadio().GW_ID, getNR4Zone(textViewZone.getText().toString()), getNR4CH(crtChannels.get(which).chName));
}
});
@ -492,7 +492,7 @@ public class RadioActivity extends Activity {
@Override
public void onClick(View v) {
if(parentTab.crtRadio!=null)
if(parentTab.getCrtRadio() !=null)
{
// display dialog with adapter
ArrayList<String> tmp = new ArrayList<String>();
@ -511,7 +511,7 @@ public class RadioActivity extends Activity {
// send change to App
//onZoneCHChange(parentTab.crtRadio.ID, parentTab.crtRadio.GW_ID, getNR4Zone(crtZones.get(which).ZoneName), getNR4CH(textViewChannel.getText().toString()));
onZoneCHChange(parentTab.crtRadio.ID, parentTab.crtRadio.GW_ID, getNR4Zone(crtZones.get(which).ZoneName), 1);
onZoneCHChange(parentTab.getCrtRadio().ID, parentTab.getCrtRadio().GW_ID, getNR4Zone(crtZones.get(which).ZoneName), 1);
}
});
@ -560,7 +560,7 @@ public class RadioActivity extends Activity {
@Override
public void onClick(View v) {
if(parentTab.crtRadio!=null)
if(parentTab.getCrtRadio() !=null)
{
// create spinner selected
AlertDialog.Builder builder = new AlertDialog.Builder(context);
@ -686,17 +686,17 @@ public class RadioActivity extends Activity {
{
// save radios
AppParams.listRadios = radios;
if(parentTab.crtRadio == null)
parentTab.crtRadio = AppParams.listRadios.get(0);
if(parentTab.getCrtRadio() == null)
parentTab.setCrtRadio(AppParams.listRadios.get(0));
// if crtRadio not exists anymore
if(!AppParams.listRadios.contains(parentTab.crtRadio))
parentTab.crtRadio = AppParams.listRadios.get(0);
if(!AppParams.listRadios.contains(parentTab.getCrtRadio()))
parentTab.setCrtRadio(AppParams.listRadios.get(0));
SM.Debug(parentTab.crtRadio.toString());
SM.Debug(parentTab.getCrtRadio().toString());
// get status for selected Radio
ReqRadioStatus(parentTab.crtRadio.ID, parentTab.crtRadio.GW_ID);
ReqRadioStatus(parentTab.getCrtRadio().ID, parentTab.getCrtRadio().GW_ID);
// get selected Zone and CH
onZoneCHChange(parentTab.crtRadio.ID, parentTab.crtRadio.GW_ID, 0,0);
onZoneCHChange(parentTab.getCrtRadio().ID, parentTab.getCrtRadio().GW_ID, 0,0);
myHandler.post(updateGatewaysRUN);
}
@ -716,7 +716,7 @@ public class RadioActivity extends Activity {
allGWsIP.clear();
for(RadioGW radio: AppParams.listRadios)
allGWsIP.add(radio.IP);
textViewGateway.setText(parentTab.crtRadio.IP);
textViewGateway.setText(parentTab.getCrtRadio().IP);
}
@ -743,20 +743,20 @@ public class RadioActivity extends Activity {
SM.Debug("am primit: " + _radioID + "," + _GWID + "," + _zoneNR + "," + _chNR);
if ((parentTab.crtRadio == null)||((parentTab.crtRadio.GW_ID == _GWID)&&(parentTab.crtRadio.ID == _radioID)))
if ((parentTab.getCrtRadio() == null)||((parentTab.getCrtRadio().GW_ID == _GWID)&&(parentTab.getCrtRadio().ID == _radioID)))
{
// update crtRadios, crtZones, and crtChannel
for(RadioGW radio: AppParams.listRadios)
if(radio.GW_ID == _GWID && radio.ID == _radioID)
{
parentTab.crtRadio = radio;
parentTab.setCrtRadio(radio);
crtZones = radio.zoneList;
cmdForMe = true;
}
}
if (cmdForMe)
{
for(Zone zone: parentTab.crtRadio.zoneList)
for(Zone zone: parentTab.getCrtRadio().zoneList)
if(zone.id == _zoneNR)
crtChannels = zone.channelList;
// update UI
@ -776,7 +776,7 @@ public class RadioActivity extends Activity {
if(AppParams.listRadios.size()>0)
{
textViewGateway.setText(parentTab.crtRadio.IP);
textViewGateway.setText(parentTab.getCrtRadio().IP);
// get all radio IP
allGWsIP.clear();
@ -784,13 +784,13 @@ public class RadioActivity extends Activity {
allGWsIP.add(radio.IP);
// set spinners and text
if(parentTab.crtRadio == null)
if(parentTab.getCrtRadio() == null)
{
parentTab.crtRadio = AppParams.listRadios.get(0);
parentTab.setCrtRadio(AppParams.listRadios.get(0));
textViewGateway.setText(allGWsIP.get(0));
// set zone
ArrayList<String> zones = new ArrayList<String>();
crtZones = parentTab.crtRadio.zoneList;
crtZones = parentTab.getCrtRadio().zoneList;
for(Zone zone: crtZones)
zones.add(zone.ZoneName);
@ -799,7 +799,7 @@ public class RadioActivity extends Activity {
//spinnerZone.setSelection(0);
// set channel
ArrayList<String> channel = new ArrayList<String>();
crtChannels = parentTab.crtRadio.zoneList.get(0).channelList;
crtChannels = parentTab.getCrtRadio().zoneList.get(0).channelList;
for(Channel ch: crtChannels)
channel.add(ch.chName);
textViewChannel.setText(channel.get(0).toString());
@ -811,10 +811,10 @@ public class RadioActivity extends Activity {
{
for(RadioGW radio: AppParams.listRadios)
if(radio.ID == radioID && radio.GW_ID == GWID)
parentTab.crtRadio = radio;
parentTab.setCrtRadio(radio);
// get zones for adapter
ArrayList<String> zones = new ArrayList<String>();
crtZones = parentTab.crtRadio.zoneList;
crtZones = parentTab.getCrtRadio().zoneList;
int position = 0;
// get selected Zone
for(int i=0; i< crtZones.size(); i++)
@ -828,7 +828,7 @@ public class RadioActivity extends Activity {
// set channel
ArrayList<String> channel = new ArrayList<String>();
crtChannels = parentTab.crtRadio.zoneList.get(position).channelList;
crtChannels = parentTab.getCrtRadio().zoneList.get(position).channelList;
position = 0;
// get current channel
for(int i=0; i< crtChannels.size(); i++)
@ -856,7 +856,7 @@ public class RadioActivity extends Activity {
{
UpdateEnableDisableButtons("offline");
onZoneCHChange(radio.ID, radio.GW_ID,0,0); // get zone and channel for crt radio
parentTab.crtRadio = radio;
parentTab.setCrtRadio(radio);
}
textViewGateway.setText(newIP);
@ -957,10 +957,10 @@ public class RadioActivity extends Activity {
buttonPTT.setEnabled(true);
buttonDKey.setEnabled(false);
}
if(parentTab.crtActivity == parentTab.RADIO && selectedCallType == calltype)
if(parentTab.getCrtActivity() == parentTab.RADIO_TAB_ID && selectedCallType == calltype)
parentTab.enableMenuButtons(false);
if(selectedCallType == calltype)
parentTab.inCall = true;
parentTab.setInCall(true);
}
else if (callstatus==3)
@ -986,7 +986,7 @@ public class RadioActivity extends Activity {
}
parentTab.enableMenuButtons(true);
parentTab.inCall = false;
parentTab.setInCall(false);
}
}
}
@ -1182,8 +1182,8 @@ public class RadioActivity extends Activity {
// send Dekey to AppServer
private void SendDekey()
{
if(parentTab.crtRadio != null)
parentTab.sendDekey(parentTab.crtRadio.GW_ID, parentTab.crtRadio.ID);
if(parentTab.getCrtRadio() != null)
parentTab.sendDekey(parentTab.getCrtRadio().GW_ID, parentTab.getCrtRadio().ID);
}
// send change Channel and Zone message to AppServer
@ -1215,8 +1215,8 @@ public class RadioActivity extends Activity {
//113 -grpcall stop
public void SendPTT(int callType, int id,int gwid, int rgwid,long userID)
{
SM.Debug("SendPTT callType:"+callType);
parentTab.SendPTT(callType, id,gwid,rgwid,userID);
SM.Debug("sendPTT callType:"+callType);
parentTab.sendPTT(callType, id,gwid,rgwid,userID);
}
@ -1241,13 +1241,13 @@ public class RadioActivity extends Activity {
UpdateZoneCH(zc.rgwID, zc.gwID, zc.zoneNr, zc.channelNr);
}
else if (action.equals(OperationCodes.RADIOID_CHANGED+"")) {
textViewGateway.setText(parentTab.crtRadio.IP);
textViewChannel.setText(parentTab.crtRadio.getChannelName());
textViewZone.setText(parentTab.crtRadio.getZoneName());
textViewGateway.setText(parentTab.getCrtRadio().IP);
textViewChannel.setText(parentTab.getCrtRadio().getChannelName());
textViewZone.setText(parentTab.getCrtRadio().getZoneName());
// update UI
myHandler.post(UpdateResultsZoneChannelRUN);
radioGWChanged(parentTab.crtRadio.IP);
radioGWChanged(parentTab.getCrtRadio().IP);
}
}
};

20
safeDispatch/src/main/java/com/safemobile/dispatch/RecordingsActivity.java → safeDispatch/src/main/java/com/safemobile/safedispatch/RecordingsActivity.java
View File

@ -1,4 +1,4 @@
package com.safemobile.dispatch;
package com.safemobile.safedispatch;
import android.app.Activity;
import android.app.AlertDialog;
@ -127,7 +127,7 @@ public class RecordingsActivity extends Activity {
// change gateway
textViewGateway.setText(allGWsIP.get(which));
Toast.makeText(context, getString(R.string.loadingRecordings), Toast.LENGTH_SHORT).show();
GetRecordings(parentTab.allRadios.get(which).GW_ID, parentTab.allRadios.get(which).ID);
GetRecordings(parentTab.getAllRadios().get(which).GW_ID, parentTab.getAllRadios().get(which).ID);
}
});
AlertDialog alert = builder.create();
@ -137,7 +137,7 @@ public class RecordingsActivity extends Activity {
textViewGateway.setVisibility(View.INVISIBLE);
parentTab.recordingsActivity = this;
parentTab.setRecordingsActivity(this);
// register to receive broadcasts
registerBroadcastIntents();
@ -208,17 +208,17 @@ public class RecordingsActivity extends Activity {
Toast.makeText(context, getString(R.string.moreRecordings), Toast.LENGTH_SHORT).show();
if(parentTab.crtRadio != null)
textViewGateway.setText(parentTab.crtRadio.IP);
if(parentTab.getCrtRadio() != null)
textViewGateway.setText(parentTab.getCrtRadio().IP);
/*
if(parentTab.allRadios == null)
GetGWRadios();
*/
if(playingPosition < 0 && parentTab.crtRadio != null)
if(playingPosition < 0 && parentTab.getCrtRadio() != null)
{
SM.Debug("GetRecordings resume + crtRadio:"+parentTab.crtRadio.toString());
GetRecordings(parentTab.crtRadio.GW_ID, parentTab.crtRadio.ID);
SM.Debug("GetRecordings resume + crtRadio:"+ parentTab.getCrtRadio().toString());
GetRecordings(parentTab.getCrtRadio().GW_ID, parentTab.getCrtRadio().ID);
}
}
@ -402,8 +402,8 @@ public class RecordingsActivity extends Activity {
updateNumberOfRecordings();
}
else if (action.equals(OperationCodes.RADIOID_CHANGED+"")) {
textViewGateway.setText(parentTab.crtRadio.IP);
GetRecordings(parentTab.crtRadio.GW_ID, parentTab.crtRadio.ID);
textViewGateway.setText(parentTab.getCrtRadio().IP);
GetRecordings(parentTab.getCrtRadio().GW_ID, parentTab.getCrtRadio().ID);
}
}
};

8
safeDispatch/src/main/java/com/safemobile/dispatch/SDMobileActivity.java → safeDispatch/src/main/java/com/safemobile/safedispatch/SDMobileActivity.java
View File

@ -1,4 +1,4 @@
package com.safemobile.dispatch;
package com.safemobile.safedispatch;
import android.app.Activity;
import android.app.AlertDialog;
@ -965,7 +965,7 @@ public class SDMobileActivity extends Activity {
}
@Override
public void alarmLiveRecv(TCPEvent event) {
public void alarmLiveReceived(TCPEvent event) {
}
@Override
@ -994,7 +994,7 @@ public class SDMobileActivity extends Activity {
}
@Override
public void onTCPConnectionDown(boolean previuosWasConnectionUp) {
public void onTCPConnectionDown(boolean previousWasConnectionUp) {
SM.Debug("TCP connection with:" + (tcp != null ? tcp.serverHostname : AppParams.RADIOIP) + ":"
+ (tcp != null ? tcp.getPort() : 0) + " is DOWN!!!");
// update ui only when a change happens with tcp connection
@ -1034,7 +1034,7 @@ public class SDMobileActivity extends Activity {
}
@Override
public void onTCPConnectionStatusReceived(boolean isConnectionUp, boolean previuosWasConnectionUp) {
public void onTCPConnectionStatusReceived(boolean isConnectionUp, boolean previousWasConnectionUp) {
}

10
safeDispatch/src/main/java/com/safemobile/dispatch/SDMobileActivity_beforeMod.java → safeDispatch/src/main/java/com/safemobile/safedispatch/SDMobileActivity_beforeMod.java
View File

@ -1,4 +1,4 @@
package com.safemobile.dispatch;
package com.safemobile.safedispatch;
import java.util.ArrayList;
import java.util.List;
@ -1403,7 +1403,7 @@ public class SDMobileActivity_beforeMod extends Activity {
public void onAlarmAckReceived(TCPEvent event) { }
@Override
public void alarmLiveRecv(TCPEvent event) { }
public void alarmLiveReceived(TCPEvent event) { }
@Override
@ -1425,7 +1425,7 @@ public class SDMobileActivity_beforeMod extends Activity {
public void onRecordingsListReceived(TCPEvent event) { }
@Override
public void onTCPConnectionDown(boolean previousConnectionWasUP) {
public void onTCPConnectionDown(boolean previousWasConnectionUp) {
SM.Debug("TCP Connection Down");
// set connection is down
@ -1450,7 +1450,7 @@ public class SDMobileActivity_beforeMod extends Activity {
}
@Override
public void onTCPConnectionUp(boolean previousConnectionWasUP) {
public void onTCPConnectionUp(boolean previousWasConnectionUp) {
SM.Debug("TCP Connection UP");
// set connection is up
@ -1505,7 +1505,7 @@ public class SDMobileActivity_beforeMod extends Activity {
}
@Override
public void onTCPConnectionStatusReceived(final boolean isConnectionUp, boolean previuosWasConnectionUp) {
public void onTCPConnectionStatusReceived(final boolean isConnectionUp, boolean previousWasConnectionUp) {
//SM.Debug("TCP STATUS", "ConnectionUP: " + isConnectionUp + " | previous: " + previuosWasConnectionUp );
/*
if(!lastTCPstatus && isConnectionUp) {

6
safeDispatch/src/main/java/com/safemobile/dispatch/SetupActivity.java → safeDispatch/src/main/java/com/safemobile/safedispatch/SetupActivity.java
View File

@ -1,4 +1,4 @@
package com.safemobile.dispatch;
package com.safemobile.safedispatch;
import java.util.Locale;
@ -199,7 +199,7 @@ public class SetupActivity extends Activity {
// get default com port
//COMPORT = prefs.getString("comport", "n/a");
// get Language
AppParams.LANGUAGE = AppParams.prefs.getString("language", parentTab.databaseLanguage);
AppParams.LANGUAGE = AppParams.prefs.getString("language", parentTab.DATABASE_LANGUAGE);
}
catch(Exception ex)
{
@ -245,7 +245,7 @@ public class SetupActivity extends Activity {
parentTab.stopTCPParser();
// recreate TCP with new settings
parentTab.loadSettings();
parentTab.TCPinit();
parentTab.tcpInit();
*/
// start thread to add listener
/*

2327
safeDispatch/src/main/java/com/safemobile/safedispatch/TabLayoutActivity.java Normal file
View File

File diff suppressed because it is too large Load Diff

69
safeDispatch/src/main/res/layout/dialog.xml
View File

@ -1,35 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/layout_root"
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:padding="10dp"
>
<ImageView android:id="@+id/image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:layout_gravity="center_vertical"
android:src="@mipmap/ic_launcher"
/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_gravity="center_vertical"
android:gravity="center_vertical">
<TextView android:id="@+id/text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="8dp"
android:textSize="18dp"
/>
<TextView android:id="@+id/text2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="8dp"
android:textSize="18dp"
/>
</LinearLayout>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/layout_root"
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:padding="10dp" >
<ImageView
android:id="@+id/image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:layout_gravity="center_vertical"
android:src="@mipmap/ic_launcher"
/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_gravity="center_vertical"
android:gravity="center_vertical">
<TextView
android:id="@+id/text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="8dp"
android:textSize="18dp"
/>
<TextView
android:id="@+id/text2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="8dp"
android:textSize="18dp"
/>
</LinearLayout>
</LinearLayout>

6
safeDispatch/src/main/res/values/strings.xml
View File

@ -257,5 +257,11 @@
<string name="speedMph">%1$d mph</string>
<string name="DialogService_Info_ErrorMessage">Oops, something happened</string>
<string name="go_to_settings">Go to settings</string>
<string name="permission_denied">Permission Denied</string>
<string name="permissionBlocked">%1$s permission was not accepted. To be able to use the %2$s, please open application settings and grant the %3$s permission</string>
<string name="microphone">Microphone</string>
<string name="radio_tab">Radio Tab</string>
</resources>