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

Compare commits

base: Safemobile:e59b522ccbf637453fe5c14b13120ac0aae57f82
Branches Tags
Safemobile:develop
Safemobile:convert_to_mph
Safemobile:SD_256_incorect_timestamp_in_buble_live_tab
Safemobile:SD-230
Safemobile:show_notifications
Safemobile:refresh_list_after_on_item_click
Safemobile:SD-222
Safemobile:SD-219
Safemobile:SD-224
Safemobile:SD-217
Safemobile:SD-225
Safemobile:feature/notifications
Safemobile:features/SD-203-add-dialogs-for-history-tab
Safemobile:fix/SD-216-back-navigation-broken
Safemobile:features/SD-211-recordings-tab
Safemobile:feature/allow_server_reconnection_on_mobile_data
Safemobile:feature/icon_and_background
Safemobile:features/SD-188-Create_Permission_module_and_request_audio
Safemobile:feature/new_signature
Safemobile:feature/apk_versioning_mechanism
Safemobile:features/SD-207-get_alarms_and_send_ack
Safemobile:features/SD-185-update-app-to_support-new-message-parsing
Safemobile:features/SD-199-livetab-check
Safemobile:initial-commit
Safemobile:master
Safemobile:8.0
..
compare: Safemobile:3f96055a6e4cee36a5844536c81aa930b9203985
Branches Tags
Safemobile:develop
Safemobile:convert_to_mph
Safemobile:SD_256_incorect_timestamp_in_buble_live_tab
Safemobile:SD-230
Safemobile:show_notifications
Safemobile:refresh_list_after_on_item_click
Safemobile:SD-222
Safemobile:SD-219
Safemobile:SD-224
Safemobile:SD-217
Safemobile:SD-225
Safemobile:feature/notifications
Safemobile:features/SD-203-add-dialogs-for-history-tab
Safemobile:fix/SD-216-back-navigation-broken
Safemobile:features/SD-211-recordings-tab
Safemobile:feature/allow_server_reconnection_on_mobile_data
Safemobile:feature/icon_and_background
Safemobile:features/SD-188-Create_Permission_module_and_request_audio
Safemobile:feature/new_signature
Safemobile:feature/apk_versioning_mechanism
Safemobile:features/SD-207-get_alarms_and_send_ack
Safemobile:features/SD-185-update-app-to_support-new-message-parsing
Safemobile:features/SD-199-livetab-check
Safemobile:initial-commit
Safemobile:master
Safemobile:8.0

No commits in common. "e59b522ccbf637453fe5c14b13120ac0aae57f82" and "3f96055a6e4cee36a5844536c81aa930b9203985" have entirely different histories.
e59b522ccb ... 3f96055a6e

18 changed files with 868 additions and 840 deletions
Show Stats Expand all files Collapse all files

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

@ -28,11 +28,13 @@ public class TCPService extends Service {
int port = 13589;
try {
port = Integer.parseInt(AppParams.PORT);
} catch(Exception ex) { }
}
catch(Exception ex) { }
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);
}

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

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

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

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

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

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

@ -1,13 +1,12 @@
<?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:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:padding="10dp" >
<ImageView
android:id="@+id/image"
android:padding="10dp"
>
<ImageView android:id="@+id/image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
@ -20,19 +19,19 @@
android:orientation="vertical"
android:layout_gravity="center_vertical"
android:gravity="center_vertical">
<TextView
android:id="@+id/text"
<TextView android:id="@+id/text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="8dp"
android:textSize="18dp"
android:textColor="@color/black"
/>
<TextView
android:id="@+id/text2"
<TextView android:id="@+id/text2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="8dp"
android:textSize="18dp"
android:textColor="@color/black"
/>
</LinearLayout>
</LinearLayout>

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

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

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

@ -210,6 +210,8 @@
</LinearLayout>
</LinearLayout>
<RelativeLayout
android:id="@+id/frameLayoutLanguage"
android:layout_width="wrap_content"
@ -219,7 +221,11 @@
android:layout_alignParentBottom="true"
android:layout_gravity="right"
android:paddingBottom="6dp"
android:layout_toLeftOf="@+id/frameLayout13" />
android:layout_toLeftOf="@+id/frameLayout13">
</RelativeLayout>
<ImageView
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_height="wrap_content"
android:layout_weight="0"
android:background="@drawable/checked"
android:orientation="horizontal" />
android:background="@drawable/checked">
</LinearLayout>
</LinearLayout>

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

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

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

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

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

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

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

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

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

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