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

#SD-185 - Make the UI compatible with SMS parsing changes

Browse Source
This commit is contained in:
Bogdan Ungureanu
2022-03-18 08:40:05 +02:00
parent 85cf7ae6a4
commit b072355b4f
8 changed files with 1418 additions and 1753 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1282
safeDispatch/src/main/java/com/safemobile/dispatch/MessagesActivity.java
View File

File diff suppressed because it is too large Load Diff

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

@ -405,7 +405,7 @@ public class TabLayoutActivity extends AbstractSDParentActivity{
tabHost.setCurrentTabByTag("Text");
AppParams.crtTab = AppParams.Tabs.message;
if (AppParams.DEMO && messageActivity.allVehicle.size()== 0) {
if (AppParams.DEMO && messageActivity.getAllVehicle().size()== 0) {
// select button
buttonText.setSelected(true);
// deselect other buttons
@ -419,9 +419,9 @@ public class TabLayoutActivity extends AbstractSDParentActivity{
tabHost.setCurrentTabByTag("Text");
AppParams.crtTab = AppParams.Tabs.message;
if (AppParams.DEMO && messageActivity.allVehicle.size()== 0) {
messageActivity.UpdateVehs(getAllVehicle());
messageActivity.UpdateSMS(listSMS);
if (AppParams.DEMO && messageActivity.getAllVehicle().size()== 0) {
messageActivity.updateVehicles(getAllVehicle());
messageActivity.updateSMS(listSMS);
}
}
}
@ -674,8 +674,8 @@ public class TabLayoutActivity extends AbstractSDParentActivity{
//list for SMS
if(currentActivity instanceof MessagesActivity)
{
// run update showSMS4unit(int sc_id) form MessageActivity
((MessagesActivity)currentActivity).showSMS4unit(getVehicle4Imei(imei).sc_id);
// run update showSMS4unit(int scId) form MessageActivity
((MessagesActivity)currentActivity).showSMS4unit(getVehicle4Imei(imei).scId);
}
*/
}
@ -821,9 +821,9 @@ public class TabLayoutActivity extends AbstractSDParentActivity{
tabHost.setCurrentTabByTag("Text");
AppParams.crtTab = AppParams.Tabs.message;
messageActivity.sc_id = getVehicle4Imei(getImei()).sc_id;
messageActivity.setScId(getVehicle4Imei(getImei()).sc_id);
messageActivity.LASTMESSAGES = false;
messageActivity.GetLastSMS();
messageActivity.getLastSMS();
// disable notification
if(mNotificationManager!=null)
@ -1019,7 +1019,7 @@ public class TabLayoutActivity extends AbstractSDParentActivity{
if(radioActivity!=null)
radioActivity.onCreate(radioActivity.savedInstanceState);
if(messageActivity!=null)
messageActivity.onCreate(messageActivity.savedInstanceState);
messageActivity.onCreate(messageActivity.getSavedInstanceState());
if(recordingsActivity!=null)
recordingsActivity.onCreate(recordingsActivity.savedInstanceState);
if(alarmActivity!=null)
@ -1319,9 +1319,9 @@ public class TabLayoutActivity extends AbstractSDParentActivity{
//list for SMS
if(AppParams.crtTab == AppParams.Tabs.message)
{
//SM.Debug("currentActivity instanceof MessagesActivity - NewSMS");
//SM.Debug("currentActivity instanceof MessagesActivity - newSMS");
if(messageActivity != null)
messageActivity.UpdateSMS(sms.smsList);
messageActivity.updateSMS(sms.smsList);
}
}
catch(Exception ex)
@ -1370,7 +1370,7 @@ public class TabLayoutActivity extends AbstractSDParentActivity{
{
SM.Debug("currentActivity instanceof MessagesActivity");
if(messageActivity != null)
messageActivity.UpdateVehs(vMSG.vehList);
messageActivity.updateVehicles(vMSG.vehList);
}
setAllVehicle(vMSG.vehList);
}
@ -1387,7 +1387,7 @@ public class TabLayoutActivity extends AbstractSDParentActivity{
{
//SM.Debug("currentActivity instanceof MessagesActivity");
if(messageActivity != null)
messageActivity.UpdateSMS(sms.smsList);
messageActivity.updateSMS(sms.smsList);
}
}
catch (Exception ex)
@ -1433,7 +1433,7 @@ public class TabLayoutActivity extends AbstractSDParentActivity{
SM.Debug("Got smsComfirm msg.data:" + msg.data);
if (messageActivity != null)
messageActivity.ConfirmSMS(sms.data, msg.seqID);
messageActivity.confirmSMS(sms.data, msg.seqID);
}
@Override
@ -1466,8 +1466,8 @@ public class TabLayoutActivity extends AbstractSDParentActivity{
});
//list for SMS
if(AppParams.crtTab == AppParams.Tabs.message && messageActivity!= null) {
SM.Debug("currentActivity instanceof MessagesActivity - NewSMS | " + tempArr[0] + " | " + tempArr[1]);
messageActivity.NewSMS(tempArr[0], tempArr[1], time);
SM.Debug("currentActivity instanceof MessagesActivity - newSMS | " + tempArr[0] + " | " + tempArr[1]);
messageActivity.newSMS(tempArr[0], tempArr[1], time);
}
}
@ -1858,7 +1858,7 @@ public class TabLayoutActivity extends AbstractSDParentActivity{
//list for SMS
if(AppParams.crtTab == AppParams.Tabs.alarms)
{
SM.Debug("currentActivity instanceof AlarmActivity - NewSMS | " + tempArr[0] + " | " + tempArr[1]);
SM.Debug("currentActivity instanceof AlarmActivity - newSMS | " + tempArr[0] + " | " + tempArr[1]);
getAlarms(AppParams.USERID);
}
// if tab is not TextTab
@ -2315,19 +2315,19 @@ public class TabLayoutActivity extends AbstractSDParentActivity{
}
}
public void optionForUnit(int radioCode, int opCode, int sc_id, int value)
public void optionForUnit(int radioCode, int opCode, int scId, int value)
{
boolean res = tcp.Write("0.0", "#"+radioCode+"#"+opCode+"#" + sc_id+"#" +value + "#");
boolean res = tcp.Write("0.0", "#"+radioCode+"#"+opCode+"#" + scId+"#" +value + "#");
if(res){
SM.Debug("Message (optionForUnit) sent to app server radioCode:"+radioCode+ " opCode:"+opCode+ " sc_id:"+sc_id+ " value:"+value);
SM.Debug("Message (optionForUnit) sent to app server radioCode:"+radioCode+ " opCode:"+opCode+ " scId:"+scId+ " value:"+value);
}else{
SM.Debug("Could not send message(optionForUnit)!!");
}
}
public void getSMS4unit(int sc_id, long timeGMT)
public void getSMS4unit(int scId, long timeGMT)
{
boolean res = tcp.Write("0.0", "#22#"+sc_id+"#" +timeGMT+"#");
boolean res = tcp.Write("0.0", "#22#"+scId+"#" +timeGMT+"#");
if(res){
SM.Debug("Message (getLastSMS) sent to app server");
}else{
@ -2345,11 +2345,11 @@ public class TabLayoutActivity extends AbstractSDParentActivity{
}
}
public void SendSMS(String seqID,int sc_id, String txt)
public void SendSMS(String seqID,int scId, String txt)
{
boolean res = tcp.Write(seqID, "#24#" + AppParams.USERID + "#" + sc_id + "#" + txt + "#");
boolean res = tcp.Write(seqID, "#24#" + AppParams.USERID + "#" + scId + "#" + txt + "#");
if(res){
SM.Debug("Message (SendSMS) sent to app server sc_id:"+sc_id+ " txt:"+txt);
SM.Debug("Message (SendSMS) sent to app server scId:"+scId+ " txt:"+txt);
}else{
SM.Debug("Could not send message(getLastSMS)!!");
}
@ -2385,10 +2385,10 @@ public class TabLayoutActivity extends AbstractSDParentActivity{
}
}
public void getHistoryPos(int sc_id, long timeGMTStart, long timeGMTStop)
public void getHistoryPos(int scId, long timeGMTStart, long timeGMTStop)
{
HistSeqID = "1."+Integer.toString((int) (System.currentTimeMillis() / 1000L));
boolean res = tcp.Write(HistSeqID,"#26#"+sc_id+"#"+timeGMTStart+"#"+timeGMTStop+"#");
boolean res = tcp.Write(HistSeqID,"#26#"+scId+"#"+timeGMTStart+"#"+timeGMTStop+"#");
if(res){
SM.Debug("Message (getHistoryPos) sent to app server");
}else{