From 8127caa9493f54d65ce792c8e108eb5f2a762492 Mon Sep 17 00:00:00 2001 From: Bogdan Date: Fri, 18 Mar 2022 18:43:48 +0200 Subject: [PATCH] #SD-207 - send more data for ack to occur --- .../activities/AbstractSDParentActivity.java | 4 +- .../safemobile/dispatch/AlarmActivity.java | 386 +++++++++--------- .../dispatch/TabLayoutActivity.java | 12 +- 3 files changed, 191 insertions(+), 211 deletions(-) diff --git a/libSafeMobile/src/main/java/com/safemobile/activities/AbstractSDParentActivity.java b/libSafeMobile/src/main/java/com/safemobile/activities/AbstractSDParentActivity.java index 1564341..16b0df2 100644 --- a/libSafeMobile/src/main/java/com/safemobile/activities/AbstractSDParentActivity.java +++ b/libSafeMobile/src/main/java/com/safemobile/activities/AbstractSDParentActivity.java @@ -155,12 +155,12 @@ public abstract class AbstractSDParentActivity extends TabActivity { } - public boolean sendAlarmAcknowledge(int alarm_id, int type) + public boolean sendAlarmAcknowledge(int alarm_id, int type, String unitName) { if(tcp == null) return false; - boolean res = tcp.Write("0.0", "#28#" + alarm_id + "#" + type + "#"); + boolean res = tcp.Write("0.0", "#28#" + alarm_id + "#" + type + "#" + AppParams.USERID + "#" + unitName + "#"); if(res) SM.Debug("Message [sendAlarmAcknowledge] sent to app server alarm_id:" + alarm_id + " type:" + type); else diff --git a/safeDispatch/src/main/java/com/safemobile/dispatch/AlarmActivity.java b/safeDispatch/src/main/java/com/safemobile/dispatch/AlarmActivity.java index ac6e7de..70631e5 100644 --- a/safeDispatch/src/main/java/com/safemobile/dispatch/AlarmActivity.java +++ b/safeDispatch/src/main/java/com/safemobile/dispatch/AlarmActivity.java @@ -3,7 +3,6 @@ package com.safemobile.dispatch; import java.util.ArrayList; import java.util.Locale; -/** fix import*/ import com.safemobile.adapters.AlertGridViewAdapter; import com.safemobile.adapters.AlertGridViewAdapter.ViewHolder; @@ -15,11 +14,11 @@ import com.safemobile.lib.SM; import android.app.Activity; import android.app.AlertDialog; import android.content.Context; -import android.content.DialogInterface; import android.content.res.Configuration; import android.graphics.Typeface; import android.os.Bundle; import android.os.Handler; +import android.os.Looper; import android.view.View; import android.widget.AdapterView; import android.widget.TextView; @@ -28,232 +27,213 @@ import android.widget.GridView; public class AlarmActivity extends Activity { private Context context; - public TabLayoutActivity parentTab; - public ArrayList allAlarms = new ArrayList(); - private ArrayList acknowledged = new ArrayList(); + private TabLayoutActivity parentTab; + private ArrayList allAlarms = new ArrayList<>(); + private ArrayList acknowledged = new ArrayList<>(); private AlertGridViewAdapter adapter; - + /* Visual resources */ private GridView gridView; - public View convertViewAlarm; - - private int ack_position; - - public Bundle savedInstanceState; - - // Need handler for callbacks to the UI thread - private final Handler myHandler = new Handler(); - - /** Called when the activity is first created. */ - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - this.savedInstanceState = savedInstanceState; - // get parentTab - parentTab = (TabLayoutActivity)getParent(); - - Locale locale = new Locale(AppParams.LANGUAGETMP); - Locale.setDefault(locale); - Configuration config = new Configuration(); - config.locale = locale; - getBaseContext().getResources().updateConfiguration(config, - getBaseContext().getResources().getDisplayMetrics()); - - - context = this; - setContentView(R.layout.tabalarm); + private View convertViewAlarm; - gridView = (GridView) findViewById(R.id.gridViewAlarms); - adapter = new AlertGridViewAdapter(this, allAlarms, context, acknowledged); - gridView.setAdapter(adapter); - - gridView.setOnItemClickListener(onItemClickListener); - - // change tab header fontface - TextView textView1 = (TextView) findViewById(R.id.textView1); - textView1.setTypeface(Typeface.createFromAsset(getAssets(), "Sketch_Block.ttf")); - textView1.setTextSize(24); - - parentTab.alarmActivity = this; - } - - @Override - public void onBackPressed() - { - AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setMessage(getString(R.string.exit)) - .setCancelable(false) - .setNeutralButton(getString(R.string.logout), new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int id) { - parentTab.whenBackPressed(AppParams.ActivityResult.logout); - } - }) - .setPositiveButton(getString(R.string.ext), new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int id) { - parentTab.whenBackPressed(AppParams.ActivityResult.exit); - } - }) - .setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int id) { - dialog.cancel(); - } - }); - AlertDialog alert = builder.create(); - alert.show(); - } - - @Override - public void onPause() - { - super.onPause(); - SM.Debug("onPause"); - } - - @Override - public void onResume() - { - super.onResume(); - if(!AppParams.DEMO) - GetAlarms(); - else if (AppParams.DEMO) - { - for(int i=allAlarms.size()-1; i>=0; i--) - { - Alarm alarm = allAlarms.get(i); - if(alarm.ack==1) - allAlarms.remove(i); - } - - acknowledged = new ArrayList(); - - for(int i=0;i getParentTab().whenBackPressed(AppParams.ActivityResult.logout)) + .setPositiveButton(getString(R.string.ext), (dialog, id) -> getParentTab().whenBackPressed(AppParams.ActivityResult.exit)) + .setNegativeButton(getString(R.string.cancel), (dialog, id) -> dialog.cancel()); + AlertDialog alert = builder.create(); + alert.show(); + } + + @Override + public void onPause() { + super.onPause(); + SM.Debug("onPause"); + } + + @Override + public void onResume() { + super.onResume(); + if (!AppParams.DEMO) + getAlarms(); + else { + for (int i = getAllAlarms().size() - 1; i >= 0; i--) { + Alarm alarm = getAllAlarms().get(i); + if (alarm.ack == 1) + getAllAlarms().remove(i); + } + + acknowledged = new ArrayList<>(); + + for (int i = 0; i < getAllAlarms().size(); i++) + acknowledged.add(false); + updateResultsInUi(ALARM); + } + SM.Debug("onResume"); + } + + + private final OnItemClickListener onItemClickListener = new OnItemClickListener() { @Override public void onItemClick(AdapterView arg0, View arg1, int position, - long arg3) { + long arg3) { SM.Debug(" ### CLICK Alarm : " + position); - convertViewAlarm = arg1; + setConvertViewAlarm(arg1); // save position - ack_position = position; - //Toast.makeText(context, "SETACK " + idx, 1000).show(); - if(!AppParams.DEMO) - setACK(allAlarms.get(position).idx,allAlarms.get(position).type); - else - { - allAlarms.get(position).ack = 1; + ackPosition = position; + if (!AppParams.DEMO) + setACK(getAllAlarms().get(position).idx, getAllAlarms().get(position).type, getAllAlarms().get(position).unitName); + else { + getAllAlarms().get(position).ack = 1; updateResultsInUi("else"); } } + + // send ACK to AppServer + private void setACK(int idx, int type, String unitName) { + getParentTab().executeNetworkStuff(new String[]{OperationCodes.SendAlarmAcknoledge + "", idx + "", type + "", unitName}); + } }; - - // Update Alarms received from AppServer - public void UpdateAlarms(ArrayList list) - { - SM.Debug("## UpdateAlarms: " + list.size()); - allAlarms = list; - acknowledged = new ArrayList(); + + // Update Alarms received from AppServer + public void updateAlarms(ArrayList list) { + SM.Debug("## updateAlarms: " + list.size()); + setAllAlarms(list); + acknowledged = new ArrayList<>(); // set acknowledged based on alarm.ack value - - for(Alarm alarm: allAlarms) - { - acknowledged.add((alarm.ack == 1)? true: false); - SM.Debug("ALARM", "SC_ID> " + alarm.sc_id + " | " - + (parentTab.getVehHashByScId().get(alarm.sc_id) == null ? "null" : parentTab.getVehHashByScId().get(alarm.sc_id).name )); - - - if (parentTab.getVehHashByScId().get(alarm.sc_id)!=null) - alarm.unitName = parentTab.getVehHashByScId().get(alarm.sc_id).name; - - - - /*Enumeration keylist = parentTab.SuperVehHash.keys(); - while(keylist.hasMoreElements()) - { - SuperVehicle tmp = (SuperVehicle)((parentTab.SuperVehHash.get((long)keylist.nextElement()))); - if (tmp.sc_id==alarm.sc_id) - { - alarm.unitName = tmp.name; - break; - } - }*/ - } - - myHandler.post(UpdateResultsRUN); - - } - - // Create runnable for posting - final Runnable UpdateResultsRUN = new Runnable() { - public void run() { - updateResultsInUi("alarm"); - } - }; - private void updateResultsInUi(String param) - { - if(param.equals("alarm")) - { - // set adapter - adapter = new AlertGridViewAdapter(this, allAlarms, context, acknowledged); - gridView.setAdapter(adapter); - } - else - { - adapter.changeACK(ack_position); - SM.Debug("Set ACK: " + ack_position + " | " + (acknowledged.get(ack_position) ? "true": "false")); + for (Alarm alarm : getAllAlarms()) { + acknowledged.add(alarm.ack == 1); + SM.Debug("ALARM", "SC_ID> " + alarm.sc_id + " | " + + (getParentTab().getVehHashByScId().get(alarm.sc_id) == null ? "null" : getParentTab().getVehHashByScId().get(alarm.sc_id).name)); - ViewHolder viewAlarm = new ViewHolder(); - viewAlarm = (ViewHolder) convertViewAlarm.getTag(); - - switch(acknowledged.get(ack_position) ? 1 : 0) - { + + if (getParentTab().getVehHashByScId().get(alarm.sc_id) != null) + alarm.unitName = getParentTab().getVehHashByScId().get(alarm.sc_id).name; + } + myHandler.post(updateResultsRUN); + } + + // Create runnable for posting + final Runnable updateResultsRUN = () -> updateResultsInUi(ALARM); + + private void updateResultsInUi(String param) { + if (param.equals(ALARM)) { + // set adapter + adapter = new AlertGridViewAdapter(this, getAllAlarms(), context, acknowledged); + gridView.setAdapter(adapter); + } else { + adapter.changeACK(ackPosition); + SM.Debug("Set ACK: " + ackPosition + " | " + (Boolean.TRUE.equals(acknowledged.get(ackPosition)) ? "true" : "false")); + + ViewHolder viewAlarm; + viewAlarm = (ViewHolder) getConvertViewAlarm().getTag(); + + switch (Boolean.TRUE.equals(acknowledged.get(ackPosition)) ? 1 : 0) { case 1: viewAlarm.imageViewAlert.setImageResource(R.drawable.alert_off); - //view.imgViewIcon.setImageDrawable(adapter.convertToGrayscale(activity.getResources().getDrawable(liveVehicle.get(position).getSmallIcon()))); break; case 0: - //view.imgViewAlarm.setImageResource(R.drawable.siren); - //view.imgViewIcon.setImageResource(liveVehicle.get(position).getSmallIcon()); + viewAlarm.imageViewAlert.setImageResource(R.drawable.siren); break; + default: + throw new IllegalStateException("Unexpected value: " + (Boolean.TRUE.equals(acknowledged.get(ackPosition)) ? 1 : 0)); } } } - + // update ACK received from AppServer - public void UpdateACK() - { - myHandler.post(UpdateAckRUN); + public void updateACK() { + myHandler.post(updateAckRUN); } - - // Create runnable for posting - final Runnable UpdateAckRUN = new Runnable() { - public void run() { - SM.Debug(" UpdateACK: "); - updateResultsInUi("adapter"); - } - }; - - - // send to AppServer - private void GetAlarms() - { - parentTab.executeNetworkStuff(new String[]{OperationCodes.GetAlarms +"", AppParams.USERID + ""}); - //parentTab.getAlarms(AppParams.USERID); + + // Create runnable for posting + final Runnable updateAckRUN = () -> { + SM.Debug(" updateACK: "); + updateResultsInUi("adapter"); + }; + + // send to AppServer + private void getAlarms() { + getParentTab().executeNetworkStuff(new String[]{OperationCodes.GetAlarms + "", AppParams.USERID + ""}); + } + + public TabLayoutActivity getParentTab() { + return parentTab; + } + + public void setParentTab(TabLayoutActivity parentTab) { + this.parentTab = parentTab; + } + + public ArrayList getAllAlarms() { + return allAlarms; + } + + public void setAllAlarms(ArrayList allAlarms) { + this.allAlarms = allAlarms; + } + + public View getConvertViewAlarm() { + return convertViewAlarm; + } + + public void setConvertViewAlarm(View convertViewAlarm) { + this.convertViewAlarm = convertViewAlarm; + } + + public Bundle getSavedInstanceState() { + return savedInstanceState; + } + + public void setSavedInstanceState(Bundle savedInstanceState) { + this.savedInstanceState = savedInstanceState; } - - // send ACK to AppServer - private void setACK(int idx, int type) - { - parentTab.executeNetworkStuff(new String[]{OperationCodes.SendAlarmAcknoledge +"", idx + "", type + ""}); - //parentTab.sendAlarmAcknowledge(idx, type); - } } diff --git a/safeDispatch/src/main/java/com/safemobile/dispatch/TabLayoutActivity.java b/safeDispatch/src/main/java/com/safemobile/dispatch/TabLayoutActivity.java index 16de642..1c94bd5 100644 --- a/safeDispatch/src/main/java/com/safemobile/dispatch/TabLayoutActivity.java +++ b/safeDispatch/src/main/java/com/safemobile/dispatch/TabLayoutActivity.java @@ -535,7 +535,7 @@ public class TabLayoutActivity extends AbstractSDParentActivity{ AppParams.crtTab = AppParams.Tabs.alarms; - if(AppParams.DEMO && alarmActivity!=null && alarmActivity.allAlarms != null && alarmActivity.allAlarms.size() ==0 ) + if(AppParams.DEMO && alarmActivity!=null && alarmActivity.getAllAlarms() != null && alarmActivity.getAllAlarms().size() ==0 ) { ArrayList listAlarms = new ArrayList(); Alarm alarm = new Alarm(); @@ -578,7 +578,7 @@ public class TabLayoutActivity extends AbstractSDParentActivity{ alarm.typestr = "Emergency"; listAlarms.add(alarm); - alarmActivity.UpdateAlarms(listAlarms); + alarmActivity.updateAlarms(listAlarms); } } @@ -1023,7 +1023,7 @@ public class TabLayoutActivity extends AbstractSDParentActivity{ if(recordingsActivity!=null) recordingsActivity.onCreate(recordingsActivity.savedInstanceState); if(alarmActivity!=null) - alarmActivity.onCreate(alarmActivity.savedInstanceState); + alarmActivity.onCreate(alarmActivity.getSavedInstanceState()); } @@ -1408,7 +1408,7 @@ public class TabLayoutActivity extends AbstractSDParentActivity{ { SM.Debug("currentActivity instanceof AlarmActivity"); if(alarmActivity != null) - alarmActivity.UpdateAlarms(Alarms.alarmList); + alarmActivity.updateAlarms(Alarms.alarmList); } } @@ -1422,7 +1422,7 @@ public class TabLayoutActivity extends AbstractSDParentActivity{ if (Integer.parseInt(tempArr[0])==1 && AppParams.crtTab == AppParams.Tabs.alarms) { if(alarmActivity != null) - alarmActivity.UpdateACK(); + alarmActivity.updateACK(); } } @@ -2548,7 +2548,7 @@ public class TabLayoutActivity extends AbstractSDParentActivity{ break; case OperationCodes.SendAlarmAcknoledge: - sendAlarmAcknowledge(Integer.parseInt(params[1]), Integer.parseInt(params[2])); + sendAlarmAcknowledge(Integer.parseInt(params[1]), Integer.parseInt(params[2]), params[3]); break; case OperationCodes.GetHistoryPositions: -- 2.37.1