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, String unitName)
+	public boolean sendAlarmAcknowledge(int alarm_id, int type)
 	{
 		if(tcp == null) 
 			return false;
 		
-		boolean res = tcp.Write("0.0", "#28#" + alarm_id + "#" + type + "#" + AppParams.USERID + "#" + unitName + "#");
+		boolean res = tcp.Write("0.0", "#28#" + alarm_id + "#" + type + "#");
 		if(res)
 			SM.Debug("Message [sendAlarmAcknowledge] sent to app server alarm_id:" + alarm_id + " type:" + type);
 		else

safeDispatch/src/main/java/com/safemobile/dispatch/AlarmActivity.java

@@ -3,6 +3,7 @@ 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;
 
@@ -14,11 +15,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;
@@ -27,213 +28,232 @@ import android.widget.GridView;
 
 public class AlarmActivity extends Activity {
 	private Context context;
-	private TabLayoutActivity parentTab;
+	public TabLayoutActivity parentTab;
-	private ArrayList<Alarm> allAlarms = new ArrayList<>();
+	public ArrayList<Alarm> allAlarms = new ArrayList<Alarm>();
-	private ArrayList<Boolean> acknowledged = new ArrayList<>();
+	private ArrayList<Boolean> acknowledged = new ArrayList<Boolean>();
 	private AlertGridViewAdapter adapter;
-
+	
 	/* Visual resources */
 	private GridView gridView;
-	private View convertViewAlarm;
+	public View convertViewAlarm;
-
+	
-	private int ackPosition;
+	private int ack_position;
-	private Bundle savedInstanceState;
+	
-
+	public Bundle savedInstanceState;
+	
 	// Need handler for callbacks to the UI thread
-	private final Handler myHandler = new Handler(Looper.getMainLooper());
+    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 static final String ALARM = "alarm";
+        gridView = (GridView) findViewById(R.id.gridViewAlarms);
-
+        adapter = new AlertGridViewAdapter(this, allAlarms, context, acknowledged);
-	/**
+        gridView.setAdapter(adapter);
-	 * Called when the activity is first created.
+      
-	 */
+        gridView.setOnItemClickListener(onItemClickListener);
-	@Override
+        
-	public void onCreate(Bundle savedInstanceState) {
+     // change tab header fontface
-		super.onCreate(savedInstanceState);
+        TextView textView1 = (TextView) findViewById(R.id.textView1);
-
+        textView1.setTypeface(Typeface.createFromAsset(getAssets(), "Sketch_Block.ttf"));
-		this.setSavedInstanceState(savedInstanceState);
+        textView1.setTextSize(24);
-		// get parentTab
+        
-		setParentTab((TabLayoutActivity) getParent());
+        parentTab.alarmActivity = this;
-
+    }
-		Locale locale = new Locale(AppParams.LANGUAGETMP);
+    
-		Locale.setDefault(locale);
+    @Override
-		Configuration config = new Configuration();
+    public void onBackPressed()
-		config.locale = locale;
+    {
-		getBaseContext().getResources().updateConfiguration(config,
+    	AlertDialog.Builder builder = new AlertDialog.Builder(this);
-				getBaseContext().getResources().getDisplayMetrics());
+    	builder.setMessage(getString(R.string.exit))
-
+    	       .setCancelable(false)
-		context = this;
+    	       .setNeutralButton(getString(R.string.logout), new DialogInterface.OnClickListener() {
-		setContentView(R.layout.tabalarm);
+    	           public void onClick(DialogInterface dialog, int id) {
-
+    	        	   parentTab.whenBackPressed(AppParams.ActivityResult.logout);
-		gridView = findViewById(R.id.gridViewAlarms);
+    	           }
-		adapter = new AlertGridViewAdapter(this, getAllAlarms(), context, acknowledged);
+    	       })
-		gridView.setAdapter(adapter);
+    	       .setPositiveButton(getString(R.string.ext), new DialogInterface.OnClickListener() {
-
+    	           public void onClick(DialogInterface dialog, int id) {
-		gridView.setOnItemClickListener(onItemClickListener);
+    	        	   parentTab.whenBackPressed(AppParams.ActivityResult.exit);
-
+    	           }
-		// change tab header fontFace
+    	       })
-		TextView textView1 = findViewById(R.id.textView1);
+    	       .setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() {
-		textView1.setTypeface(Typeface.createFromAsset(getAssets(), "Sketch_Block.ttf"));
+    	           public void onClick(DialogInterface dialog, int id) {
-		textView1.setTextSize(24);
+    	                dialog.cancel();
-
+    	           }
-		getParentTab().alarmActivity = this;
+    	       });
-	}
+    	AlertDialog alert = builder.create();
-
+    	alert.show();
-	@Override
+    }
-	public void onBackPressed() {
+    
-		AlertDialog.Builder builder = new AlertDialog.Builder(this);
+    @Override
-		builder.setMessage(getString(R.string.exit))
+    public void onPause()
-				.setCancelable(false)
+    {
-				.setNeutralButton(getString(R.string.logout), (dialog, id) -> getParentTab().whenBackPressed(AppParams.ActivityResult.logout))
+    	super.onPause();
-				.setPositiveButton(getString(R.string.ext), (dialog, id) -> getParentTab().whenBackPressed(AppParams.ActivityResult.exit))
+    	SM.Debug("onPause");
-				.setNegativeButton(getString(R.string.cancel), (dialog, id) -> dialog.cancel());
+    }
-		AlertDialog alert = builder.create();
+    
-		alert.show();
+    @Override
-	}
+    public void onResume()
-
+    {
-	@Override
+    	super.onResume();
-	public void onPause() {
+    	if(!AppParams.DEMO)
-		super.onPause();
+    		GetAlarms();
-		SM.Debug("onPause");
+    	else if (AppParams.DEMO)
-	}
+    	{
-
+    		for(int i=allAlarms.size()-1; i>=0; i--)
-	@Override
+    		{
-	public void onResume() {
+    			Alarm alarm = allAlarms.get(i);
-		super.onResume();
+    			if(alarm.ack==1)
-		if (!AppParams.DEMO)
+    				allAlarms.remove(i);
-			getAlarms();
+    		}
-		else {
+    		
-			for (int i = getAllAlarms().size() - 1; i >= 0; i--) {
+    		acknowledged = new ArrayList<Boolean>();
-				Alarm alarm = getAllAlarms().get(i);
+    		
-				if (alarm.ack == 1)
+    		for(int i=0;i<allAlarms.size();i++)
-					getAllAlarms().remove(i);
+    			acknowledged.add(false);
-			}
+    		updateResultsInUi("alarm");
-
+    	}
-			acknowledged = new ArrayList<>();
+    	SM.Debug("onResume");
-
+    }
-			for (int i = 0; i < getAllAlarms().size(); i++)
+    
-				acknowledged.add(false);
+    
-			updateResultsInUi(ALARM);
+    private OnItemClickListener onItemClickListener = new OnItemClickListener() {
-		}
-		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);
-			setConvertViewAlarm(arg1);
+			convertViewAlarm = arg1;
 			// save position 
-			ackPosition = position;
+			ack_position = position;
-			if (!AppParams.DEMO)
+			//Toast.makeText(context, "SETACK " + idx, 1000).show();
-				setACK(getAllAlarms().get(position).idx, getAllAlarms().get(position).type, getAllAlarms().get(position).unitName);
+			if(!AppParams.DEMO)
-			else {
+				setACK(allAlarms.get(position).idx,allAlarms.get(position).type);
-				getAllAlarms().get(position).ack = 1;
+			else
+			{
+				allAlarms.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
+    // Update Alarms received from AppServer 
-	public void updateAlarms(ArrayList<Alarm> list) {
+    public void UpdateAlarms(ArrayList<Alarm> list)
-		SM.Debug("## updateAlarms: " + list.size());
+    {
-		setAllAlarms(list);
+    	SM.Debug("## UpdateAlarms: " + list.size());
-		acknowledged = new ArrayList<>();
+		allAlarms = list;
+		acknowledged = new ArrayList<Boolean>();
 		// set acknowledged based on alarm.ack value
-
+		
-		for (Alarm alarm : getAllAlarms()) {
+		for(Alarm alarm: allAlarms)
-			acknowledged.add(alarm.ack == 1);
+		{
-			SM.Debug("ALARM", "SC_ID> " + alarm.sc_id + "   |  "
+			acknowledged.add((alarm.ack == 1)? true: false);
-					+ (getParentTab().getVehHashByScId().get(alarm.sc_id) == null ? "null" : getParentTab().getVehHashByScId().get(alarm.sc_id).name));
+			SM.Debug("ALARM", "SC_ID> " + alarm.sc_id +  "   |  " 
-
+					+ (parentTab.getVehHashByScId().get(alarm.sc_id) == null ? "null" : parentTab.getVehHashByScId().get(alarm.sc_id).name ));
-
+			
-			if (getParentTab().getVehHashByScId().get(alarm.sc_id) != null)
+			
-				alarm.unitName = getParentTab().getVehHashByScId().get(alarm.sc_id).name;
+			if (parentTab.getVehHashByScId().get(alarm.sc_id)!=null)
+				alarm.unitName = parentTab.getVehHashByScId().get(alarm.sc_id).name;
+			
+			
+			
+	        /*Enumeration<Long> 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);
+			
-	}
+		myHandler.post(UpdateResultsRUN);
+		
+    }
+    
+    // Create runnable for posting
+    final Runnable UpdateResultsRUN = new Runnable() {
+        public void run() {
+            updateResultsInUi("alarm");
+        }
+    };
 
-	// Create runnable for posting
+	private void updateResultsInUi(String param)
-	final Runnable updateResultsRUN = () -> updateResultsInUi(ALARM);
+	{
+		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"));
 
-	private void updateResultsInUi(String param) {
+			ViewHolder viewAlarm = new ViewHolder();
-		if (param.equals(ALARM)) {
+		    viewAlarm = (ViewHolder) convertViewAlarm.getTag();
-			// set adapter
+		    
-			adapter = new AlertGridViewAdapter(this, getAllAlarms(), context, acknowledged);
+			switch(acknowledged.get(ack_position) ? 1 : 0)
-			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:
-					viewAlarm.imageViewAlert.setImageResource(R.drawable.siren);
+					//view.imgViewAlarm.setImageResource(R.drawable.siren);
+					//view.imgViewIcon.setImageResource(liveVehicle.get(position).getSmallIcon());
 					break;
-				default:
-					throw new IllegalStateException("Unexpected value: " + (Boolean.TRUE.equals(acknowledged.get(ackPosition)) ? 1 : 0));
 			}
 		}
 	}
-
+    
 	// update ACK received from AppServer
-	public void updateACK() {
+	public void UpdateACK()
-		myHandler.post(updateAckRUN);
+	{		
+		myHandler.post(UpdateAckRUN);
 	}
-
+	
-	// Create runnable for posting
+	 // Create runnable for posting
-	final Runnable updateAckRUN = () -> {
+    final Runnable UpdateAckRUN = new Runnable() {
-		SM.Debug(" updateACK: ");
+        public void run() {
-		updateResultsInUi("adapter");
+        	SM.Debug(" UpdateACK: ");
-	};
+            updateResultsInUi("adapter");
-
+        }
-	// send to AppServer
+    };
-	private void getAlarms() {
+	
-		getParentTab().executeNetworkStuff(new String[]{OperationCodes.GetAlarms + "", AppParams.USERID + ""});
+	
-	}
+    // send to AppServer
-
+    private void GetAlarms()
-	public TabLayoutActivity getParentTab() {
+	{
-		return parentTab;
+    	parentTab.executeNetworkStuff(new String[]{OperationCodes.GetAlarms +"", AppParams.USERID + ""});
-	}
+		//parentTab.getAlarms(AppParams.USERID);
-
-	public void setParentTab(TabLayoutActivity parentTab) {
-		this.parentTab = parentTab;
-	}
-
-	public ArrayList<Alarm> getAllAlarms() {
-		return allAlarms;
-	}
-
-	public void setAllAlarms(ArrayList<Alarm> 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);
+    }
 }

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.getAllAlarms() != null && alarmActivity.getAllAlarms().size() ==0 )
+					if(AppParams.DEMO &&  alarmActivity!=null && alarmActivity.allAlarms != null && alarmActivity.allAlarms.size() ==0 )
 					{
 						ArrayList<Alarm> listAlarms = new ArrayList<Alarm>();
 						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.getSavedInstanceState());
+    		alarmActivity.onCreate(alarmActivity.savedInstanceState);
     }
     
     
@@ -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]), params[3]);
+				sendAlarmAcknowledge(Integer.parseInt(params[1]), Integer.parseInt(params[2]));
 				break;
 				
 			case OperationCodes.GetHistoryPositions: