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

Merge branch 'develop' into features/SD-211-recordings-tab

Browse Source 
# Conflicts:
#	libSafeMobile/src/main/java/com/safemobile/services/TCPhandler.java
#	safeDispatch/src/main/res/layout/dialog_login.xml
This commit is contained in:
Bogdan Ungureanu 2022-03-30 10:38:47 +03:00
commit e59b522ccb
18 changed files with 834 additions and 862 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libSafeMobile/src/main/java/com/safemobile/services/TCPService.java
View File

@ -28,13 +28,11 @@ public class TCPService extends Service {
int port = 13589; int port = 13589;
try { try {
port = Integer.parseInt(AppParams.PORT); port = Integer.parseInt(AppParams.PORT);
} } catch(Exception ex) { }
catch(Exception ex) { }
tcpParser = new TCPmsgParser(); tcpParser = new TCPmsgParser();
if(tcp == null && !AppParams.IP.equalsIgnoreCase("n/a")) if(tcp == null && !AppParams.IP.equalsIgnoreCase("n/a")) {
{
tcp = new TCPhandler(getApplicationContext(), AppParams.IP, port); tcp = new TCPhandler(getApplicationContext(), AppParams.IP, port);
} }

16
safeDispatch/src/main/java/com/safemobile/safedispatch/SDMobileActivity.java
View File

@ -233,10 +233,10 @@ public class SDMobileActivity extends Activity {
etPassword.setText(AppParams.PASSWORD.equalsIgnoreCase("n/a") ? "" : AppParams.PASSWORD); etPassword.setText(AppParams.PASSWORD.equalsIgnoreCase("n/a") ? "" : AppParams.PASSWORD);
} }
layoutTCP = (RelativeLayout) findViewById(R.id.layoutTCP); layoutTCP = findViewById(R.id.layoutTCP);
llUsername = (LinearLayout) findViewById(R.id.llUsername); llUsername = findViewById(R.id.llUsername);
llPassword = (LinearLayout) findViewById(R.id.llPassword); llPassword = findViewById(R.id.llPassword);
// enable ui after the language is changed and tcp connection is on // enable ui after the language is changed and tcp connection is on
if (tcp != null && tcp.isConnectionUP) { if (tcp != null && tcp.isConnectionUP) {
@ -663,7 +663,7 @@ public class SDMobileActivity extends Activity {
// get default password // get default password
AppParams.PASSWORD = AppParams.prefs.getString(PASSWORD, "n/a"); AppParams.PASSWORD = AppParams.prefs.getString(PASSWORD, "n/a");
// get default IP // get default IP
AppParams.IP = AppParams.prefs.getString("ip", "192.168.2.100"); AppParams.IP = AppParams.prefs.getString("ip", "185.8.154.190");
// get Radio ID & IP // get Radio ID & IP
AppParams.RADIOID = AppParams.prefs.getInt("radioId", 100); AppParams.RADIOID = AppParams.prefs.getInt("radioId", 100);
@ -737,10 +737,10 @@ public class SDMobileActivity extends Activity {
Dialog dialogInfo = new Dialog(context); Dialog dialogInfo = new Dialog(context);
dialogInfo.requestWindowFeature(Window.FEATURE_NO_TITLE); dialogInfo.requestWindowFeature(Window.FEATURE_NO_TITLE);
dialogInfo.setContentView(R.layout.dialog_login); dialogInfo.setContentView(R.layout.dialog_login);
TextView textTitle = (TextView) dialogInfo.findViewById(R.id.textTitle); TextView textTitle = dialogInfo.findViewById(R.id.textTitle);
TextView text = (TextView) dialogInfo.findViewById(R.id.text); TextView text = dialogInfo.findViewById(R.id.text);
TextView text2 = (TextView) dialogInfo.findViewById(R.id.text2); TextView text2 = dialogInfo.findViewById(R.id.text2);
ImageView image = (ImageView) dialogInfo.findViewById(R.id.image); ImageView image = dialogInfo.findViewById(R.id.image);
textTitle.setText(getString(R.string.connectionError)); textTitle.setText(getString(R.string.connectionError));
image.setImageResource(R.drawable.error); image.setImageResource(R.drawable.error);

4
safeDispatch/src/main/res/layout-large/row_livevehicle.xml
View File

@ -35,6 +35,6 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" android:layout_weight="0"
android:background="@drawable/checked"> android:background="@drawable/checked"
</LinearLayout> android:orientation="horizontal" />
</LinearLayout> </LinearLayout>

4
safeDispatch/src/main/res/layout-large/tabsetup.xml
View File

@ -32,7 +32,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/serverIP" android:text="@string/serverIP"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="#FFFFFF"
android:textStyle="bold" android:textStyle="bold"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:gravity="center_vertical|right" android:gravity="center_vertical|right"
@ -67,7 +66,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/serverPort" android:text="@string/serverPort"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="#FFFFFF"
android:textStyle="bold" android:textStyle="bold"
android:gravity="center_vertical|right" android:gravity="center_vertical|right"
android:layout_gravity="center_vertical|right" android:layout_gravity="center_vertical|right"
@ -112,7 +110,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/configName" android:text="@string/configName"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="#FFFFFF"
android:textStyle="bold" android:textStyle="bold"
android:gravity="center_vertical|right" android:gravity="center_vertical|right"
android:layout_gravity="center_vertical"/> android:layout_gravity="center_vertical"/>
@ -181,7 +178,6 @@
android:text="@string/language" android:text="@string/language"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textStyle="bold" android:textStyle="bold"
android:textColor="#FFFFFF"
android:gravity="right" android:gravity="right"
android:layout_gravity="center_vertical"/> android:layout_gravity="center_vertical"/>
<LinearLayout <LinearLayout

2
safeDispatch/src/main/res/layout/balloonname_overlay.xml
View File

@ -11,5 +11,5 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:id="@+id/balloon_vehicle_name" android:id="@+id/balloon_vehicle_name"
android:textSize="12dip" android:textSize="12dip"
android:textColor="#FF000000"></TextView> android:textColor="#FF000000" />
</LinearLayout> </LinearLayout>

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

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

2
safeDispatch/src/main/res/layout/dialog_login.xml
View File

@ -40,7 +40,6 @@
android:paddingTop="8dp" android:paddingTop="8dp"
android:text="Row1" android:text="Row1"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="@color/black"
/> />
<TextView android:id="@+id/text2" <TextView android:id="@+id/text2"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -48,7 +47,6 @@
android:paddingTop="8dp" android:paddingTop="8dp"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:text="Row2" android:text="Row2"
android:textColor="@color/black"
/> />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

8
safeDispatch/src/main/res/layout/main_before.xml
View File

@ -210,8 +210,6 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/frameLayoutLanguage" android:id="@+id/frameLayoutLanguage"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -221,11 +219,7 @@
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_gravity="right" android:layout_gravity="right"
android:paddingBottom="6dp" android:paddingBottom="6dp"
android:layout_toLeftOf="@+id/frameLayout13"> android:layout_toLeftOf="@+id/frameLayout13" />
</RelativeLayout>
<ImageView <ImageView
android:id="@+id/imageLoading" android:id="@+id/imageLoading"

4
safeDispatch/src/main/res/layout/row_livevehicle.xml
View File

@ -35,6 +35,6 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" android:layout_weight="0"
android:background="@drawable/checked"> android:background="@drawable/checked"
</LinearLayout> android:orientation="horizontal" />
</LinearLayout> </LinearLayout>

1
safeDispatch/src/main/res/layout/style_header_units.xml
View File

@ -9,7 +9,6 @@
style="?header" style="?header"
android:gravity="center_vertical" > android:gravity="center_vertical" >
<TextView <TextView
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"

1
safeDispatch/src/main/res/layout/tabalarm.xml
View File

@ -67,7 +67,6 @@
android:visibility="invisible" android:visibility="invisible"
android:background="@drawable/addmessage_selector"/> android:background="@drawable/addmessage_selector"/>
<!-- android:background="@drawable/addmessage_selector" -->
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"

16
safeDispatch/src/main/res/layout/tabradio.xml
View File

@ -123,7 +123,6 @@
android:textSize="16dp" android:textSize="16dp"
android:paddingTop="7dp" /> android:paddingTop="7dp" />
</LinearLayout> </LinearLayout>
<!-- android:background="@drawable/addmessage_selector" -->
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
@ -204,8 +203,7 @@
android:id="@+id/imageViewStatus2" android:id="@+id/imageViewStatus2"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:src="@drawable/status_offline" android:src="@drawable/status_offline" />
/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
@ -239,7 +237,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/Zone" android:text="@string/Zone"
android:textStyle="bold" android:textStyle="bold"
android:textColor="#ffffffff"
android:textAppearance="?android:attr/textAppearanceMedium"/> android:textAppearance="?android:attr/textAppearanceMedium"/>
<LinearLayout <LinearLayout
android:id="@+id/layoutSpinnerZone" android:id="@+id/layoutSpinnerZone"
@ -279,7 +276,6 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/Channel" android:text="@string/Channel"
android:textColor="#ffffffff"
android:textStyle="bold" android:textStyle="bold"
android:textAppearance="?android:attr/textAppearanceMedium"/> android:textAppearance="?android:attr/textAppearanceMedium"/>
@ -376,7 +372,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<RadioGroup android:id="@+id/radioGroupCallType" <RadioGroup
android:id="@+id/radioGroupCallType"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="3sp"> android:layout_marginBottom="3sp">
@ -388,7 +385,7 @@
android:checked="true" android:checked="true"
android:text="@string/AllCall" android:text="@string/AllCall"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="#ffffffff" /> />
<RadioButton <RadioButton
android:id="@+id/radioGroup" android:id="@+id/radioGroup"
@ -396,7 +393,7 @@
android:layout_height="30dp" android:layout_height="30dp"
android:text="@string/GroupCall" android:text="@string/GroupCall"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="#ffffffff" /> />
<RadioButton <RadioButton
android:id="@+id/radioPrivate" android:id="@+id/radioPrivate"
@ -404,7 +401,7 @@
android:layout_height="30dp" android:layout_height="30dp"
android:text="@string/PrivateCall" android:text="@string/PrivateCall"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="#ffffffff" /> />
</RadioGroup> </RadioGroup>
<LinearLayout <LinearLayout
@ -463,7 +460,6 @@
android:text="@string/DeKey" android:text="@string/DeKey"
android:textSize="18dp" /> android:textSize="18dp" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

1
safeDispatch/src/main/res/layout/tabrecordings.xml
View File

@ -123,7 +123,6 @@
android:visibility="gone" android:visibility="gone"
android:background="@drawable/recycle"/> android:background="@drawable/recycle"/>
<!-- android:background="@drawable/addmessage_selector" -->
</LinearLayout> </LinearLayout>
<GridView <GridView

18
safeDispatch/src/main/res/layout/tabsetup.xml
View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/layoutMain" android:id="@+id/layoutMain"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
@ -34,7 +35,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/serverIP" android:text="@string/serverIP"
android:textSize="14dp" android:textSize="14dp"
android:textColor="#FFFFFF"
android:textStyle="bold" android:textStyle="bold"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:gravity="center_vertical|right" android:gravity="center_vertical|right"
@ -69,7 +69,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/serverPort" android:text="@string/serverPort"
android:textSize="14dp" android:textSize="14dp"
android:textColor="#FFFFFF"
android:textStyle="bold" android:textStyle="bold"
android:gravity="center_vertical|right" android:gravity="center_vertical|right"
android:layout_gravity="center_vertical|right" android:layout_gravity="center_vertical|right"
@ -88,13 +87,11 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_gravity="center_vertical|right" android:layout_gravity="center_vertical|right"
android:inputType="number" android:inputType="number"
android:imeOptions="actionDone"> android:imeOptions="actionDone" />
</EditText>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -115,7 +112,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/configName" android:text="@string/configName"
android:textSize="14dp" android:textSize="14dp"
android:textColor="#FFFFFF"
android:textStyle="bold" android:textStyle="bold"
android:gravity="center_vertical|right" android:gravity="center_vertical|right"
android:layout_gravity="center_vertical"/> android:layout_gravity="center_vertical"/>
@ -138,7 +134,6 @@
android:singleLine="true" > android:singleLine="true" >
<requestFocus /> <requestFocus />
</EditText> </EditText>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -168,7 +163,6 @@
android:src="@drawable/questionmark_small" /> android:src="@drawable/questionmark_small" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
@ -184,7 +178,6 @@
android:text="@string/language" android:text="@string/language"
android:textSize="14dp" android:textSize="14dp"
android:layout_marginRight="2dp" android:layout_marginRight="2dp"
android:textColor="#FFFFFF"
android:textStyle="bold" android:textStyle="bold"
android:gravity="right" android:gravity="right"
android:layout_gravity="center_vertical"/> android:layout_gravity="center_vertical"/>
@ -247,9 +240,8 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<RelativeLayout <RelativeLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"> android:layout_height="wrap_content"/>
</RelativeLayout>
</LinearLayout> </LinearLayout>