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

Compare commits

merge into: Safemobile:SD-225
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
...
pull from: Safemobile:SD-219
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

4 Commits
SD-225 ... SD-219

Author SHA1 Message Date
CiufudeanDani
feb7bd654c update info bubble box info 2022-04-07 13:31:23 +03:00
CiufudeanDani
0bdd161d69 when receiving a new alarm && current tab is alarms, refresh alarm list 2022-04-07 13:14:58 +03:00
CiufudeanDani
5c075ee168 display alarm notification 2022-04-04 09:59:49 +03:00
CiufudeanDani
1299ff2d2e Merge pull request 'make messages view match parent' (#19) from SD-225 into develop 
Reviewed-on: #19
 2022-04-04 05:58:15 +00:00
3 changed files with 51 additions and 57 deletions
Expand all files Collapse all files

7
libSafeMobile/src/main/java/com/safemobile/activities/AbstractSDParentActivity.java
View File

@ -255,13 +255,12 @@ public abstract class AbstractSDParentActivity extends TabActivity {
return res; return res;
} }
public boolean getAlarms(long userID) public boolean getAlarms(long userID) {
{ if (tcp == null)
if(tcp == null)
return false; return false;
boolean res = tcp.Write("0.0", "#27#" + userID + "#"); boolean res = tcp.Write("0.0", "#27#" + userID + "#");
if(res) if (res)
SM.Debug("Message [GetAlarms] sent to app server"); SM.Debug("Message [GetAlarms] sent to app server");
else else
SM.Debug("Could not send message [GetAlarms]!!"); SM.Debug("Could not send message [GetAlarms]!!");

3
safeDispatch/src/main/java/com/safemobile/safedispatch/GoogleMapsInfoBubble.java
View File

@ -42,7 +42,6 @@ public class GoogleMapsInfoBubble implements GoogleMap.InfoWindowAdapter {
public GoogleMapsInfoBubble(LayoutInflater layoutInflater, Context context) { public GoogleMapsInfoBubble(LayoutInflater layoutInflater, Context context) {
isLiveTab = false; isLiveTab = false;
this.context = context; this.context = context;
// this.superVehHash = vehicles;
mWindow = layoutInflater.inflate(R.layout.map_marker_info_bubble, null); mWindow = layoutInflater.inflate(R.layout.map_marker_info_bubble, null);
} }
@ -73,7 +72,7 @@ public class GoogleMapsInfoBubble implements GoogleMap.InfoWindowAdapter {
} }
} else { } else {
try { try {
position = Integer.getInteger(marker.getTitle()); position = Integer.parseInt(marker.getTitle());
} catch (Exception e) { } catch (Exception e) {
Log.v(TAG, "Unable to parse Google Maps Info Bubble title on History"); Log.v(TAG, "Unable to parse Google Maps Info Bubble title on History");
} }

14
safeDispatch/src/main/java/com/safemobile/safedispatch/TabLayoutActivity.java
View File

@ -1688,13 +1688,7 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
SM.Debug("Unit imei:" + tempArr[0]); SM.Debug("Unit imei:" + tempArr[0]);
String unitIMEI = tempArr[0]; String unitIMEI = tempArr[0];
//list for SMS
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) {
// change Visual Elements // change Visual Elements
setImei(unitIMEI); setImei(unitIMEI);
switch (msg.opCode) { switch (msg.opCode) {
@ -1745,7 +1739,10 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
} }
} }
} }
}
//list for SMS
if (AppParams.crtTab == AppParams.Tabs.alarms)
getAlarms(AppParams.USERID);
} }
@Override @Override
@ -2052,7 +2049,6 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
.setAutoCancel(true) .setAutoCancel(true)
.setContentIntent(pendingIntent); .setContentIntent(pendingIntent);
Log.v("test111", "test");
NotificationManagerCompat managerCompat = NotificationManagerCompat.from(context); NotificationManagerCompat managerCompat = NotificationManagerCompat.from(context);
managerCompat.notify(icon, builder.build()); managerCompat.notify(icon, builder.build());
} }