Merge pull request 'Live Page' (#3) from feature/live into develop
Reviewed-on: #3
This commit is contained in:
commit
85cf7ae6a4
@ -2,6 +2,7 @@ package com.safemobile.activities;
|
|||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
|
||||||
|
import com.google.android.gms.maps.GoogleMap;
|
||||||
import com.safemobile.lib.Vehicle;
|
import com.safemobile.lib.Vehicle;
|
||||||
|
|
||||||
import android.app.Activity;
|
import android.app.Activity;
|
||||||
@ -23,7 +24,7 @@ public abstract class AbstractLiveActivity extends AppCompatActivity {
|
|||||||
public abstract void pollReceived(int position, double lat, double lng); // --> UpdatePoll
|
public abstract void pollReceived(int position, double lat, double lng); // --> UpdatePoll
|
||||||
public abstract void vehicleStatusReceived(long imei, int opCode, int status); // --> UpdateOptions
|
public abstract void vehicleStatusReceived(long imei, int opCode, int status); // --> UpdateOptions
|
||||||
public abstract void emergencyAlarmReceived(int position, double lat, double lng); // --> UpdateEmergencyAlarm
|
public abstract void emergencyAlarmReceived(int position, double lat, double lng); // --> UpdateEmergencyAlarm
|
||||||
|
public abstract GoogleMap getMap(); // --> UpdateEmergencyAlarm
|
||||||
|
|
||||||
/** Misc */
|
/** Misc */
|
||||||
public AbstractSDParentActivity getParentTab() {
|
public AbstractSDParentActivity getParentTab() {
|
||||||
|
|||||||
@ -21,36 +21,28 @@ public class SuperVehicle extends Vehicle{
|
|||||||
// TODO Auto-generated constructor stub
|
// TODO Auto-generated constructor stub
|
||||||
}
|
}
|
||||||
|
|
||||||
public void SetDataFromLastPos(Double _lat,Double _lng,long _time,int _speed,String _Address,Boolean _isON)
|
public void SetDataFromLastPos(Double _lat,Double _lng,long _time,int _speed,String _Address,Boolean _isON) {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
lat = _lat;
|
lat = _lat;
|
||||||
lng = _lng;
|
lng = _lng;
|
||||||
timeGMT = _time;
|
timeGMT = _time;
|
||||||
speed = _speed;
|
speed = _speed;
|
||||||
Address = _Address;
|
Address = _Address;
|
||||||
isON = _isON;
|
isON = _isON;
|
||||||
}
|
} catch (Exception ex) {
|
||||||
catch (Exception ex)
|
Log.d("Erorr", "Contert Error: "+ ex);
|
||||||
{
|
|
||||||
Log.d("Erorr", "Contert Error:"+ex.toString());
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void SetNewPosition(Double _lat,Double _lng,long _time,int _speed)
|
public void SetNewPosition(Double _lat,Double _lng,long _time,int _speed) {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
lat = _lat;
|
lat = _lat;
|
||||||
lng = _lng;
|
lng = _lng;
|
||||||
timeGMT = _time;
|
timeGMT = _time;
|
||||||
speed = _speed;
|
speed = _speed;
|
||||||
isON = true;
|
isON = true;
|
||||||
}
|
} catch (Exception ex) {
|
||||||
catch (Exception ex)
|
Log.d("Erorr", "Contert Error: " + ex);
|
||||||
{
|
|
||||||
Log.d("Erorr", "Contert Error:"+ex.toString());
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 2.0 KiB |
BIN
libSafeMobile/src/main/res/drawable-xhdpi/l_bg_gps.jpg
Normal file
BIN
libSafeMobile/src/main/res/drawable-xhdpi/l_bg_gps.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 16 KiB |
BIN
libSafeMobile/src/main/res/drawable-xhdpi/l_speed.png
Normal file
BIN
libSafeMobile/src/main/res/drawable-xhdpi/l_speed.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.1 KiB |
BIN
libSafeMobile/src/main/res/drawable-xhdpi/l_street.png
Normal file
BIN
libSafeMobile/src/main/res/drawable-xhdpi/l_street.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 22 KiB |
BIN
libSafeMobile/src/main/res/drawable-xhdpi/l_time.png
Normal file
BIN
libSafeMobile/src/main/res/drawable-xhdpi/l_time.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 19 KiB |
140
libSafeMobile/src/main/res/layout/map_marker_info_bubble.xml
Normal file
140
libSafeMobile/src/main/res/layout/map_marker_info_bubble.xml
Normal file
@ -0,0 +1,140 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?><!--
|
||||||
|
Copyright (C) 2012 The Android Open Source Project
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
-->
|
||||||
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:background="@drawable/custom_info_bubble"
|
||||||
|
android:paddingLeft="7dp"
|
||||||
|
android:paddingRight="7dp"
|
||||||
|
android:paddingTop="9dp"
|
||||||
|
android:orientation="vertical">
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/containerTop"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:background="@drawable/l_bg_gps"
|
||||||
|
android:orientation="vertical">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/tvUnitName"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_gravity="center_horizontal"
|
||||||
|
android:ellipsize="end"
|
||||||
|
android:fontFamily="sans-serif-smallcaps"
|
||||||
|
android:maxLines="1"
|
||||||
|
android:paddingTop="5dp"
|
||||||
|
tools:text="Linux 9910"
|
||||||
|
android:textColor="#FFFFFF"
|
||||||
|
android:textSize="18sp"
|
||||||
|
android:textStyle="bold" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/tvGPSLocation"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_gravity="center_horizontal"
|
||||||
|
android:ellipsize="end"
|
||||||
|
android:fontFamily="sans-serif-smallcaps"
|
||||||
|
android:maxLines="1"
|
||||||
|
tools:text="[44.41857,26.09585]"
|
||||||
|
android:textColor="#FFFFFF"
|
||||||
|
android:textSize="10sp"
|
||||||
|
tools:ignore="SmallSp" />
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<RelativeLayout
|
||||||
|
android:layout_width="225dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:padding="10dp"
|
||||||
|
android:id="@+id/rlMapInfoBubbleInfo">
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/time"
|
||||||
|
android:layout_width="24dp"
|
||||||
|
android:layout_height="24dp"
|
||||||
|
android:layout_marginRight="5dp"
|
||||||
|
android:adjustViewBounds="true"
|
||||||
|
android:src="@drawable/l_time"
|
||||||
|
android:layout_marginEnd="5dp" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/tvTimeAgo"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_alignBottom="@+id/time"
|
||||||
|
android:layout_alignTop="@+id/time"
|
||||||
|
android:layout_gravity="center_horizontal"
|
||||||
|
android:layout_toEndOf="@+id/time"
|
||||||
|
android:layout_toRightOf="@+id/time"
|
||||||
|
android:ellipsize="end"
|
||||||
|
android:gravity="center_vertical"
|
||||||
|
android:maxLines="1"
|
||||||
|
tools:text="a year ago [01:05:01]"
|
||||||
|
android:textColor="#ff000000"
|
||||||
|
android:textSize="10sp" />
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/speed"
|
||||||
|
android:layout_width="24dp"
|
||||||
|
android:layout_height="24dp"
|
||||||
|
android:layout_below="@+id/time"
|
||||||
|
android:layout_marginRight="5dp"
|
||||||
|
android:layout_marginTop="5dp"
|
||||||
|
android:adjustViewBounds="true"
|
||||||
|
android:src="@drawable/l_speed" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/tvSpeed"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_alignBottom="@+id/speed"
|
||||||
|
android:layout_alignTop="@+id/speed"
|
||||||
|
android:layout_gravity="center_horizontal"
|
||||||
|
android:layout_toRightOf="@+id/speed"
|
||||||
|
android:ellipsize="end"
|
||||||
|
android:gravity="center_vertical"
|
||||||
|
android:maxLines="1"
|
||||||
|
tools:text="24 kph"
|
||||||
|
android:textColor="#ff000000"
|
||||||
|
android:textSize="10sp" />
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/streetView"
|
||||||
|
android:layout_width="24dp"
|
||||||
|
android:layout_height="24dp"
|
||||||
|
android:layout_below="@+id/speed"
|
||||||
|
android:layout_marginTop="5dp"
|
||||||
|
android:layout_marginRight="5dp"
|
||||||
|
android:adjustViewBounds="true"
|
||||||
|
android:src="@drawable/l_street"
|
||||||
|
android:visibility="visible" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/tvStreetView"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_alignTop="@+id/streetView"
|
||||||
|
android:layout_gravity="center_horizontal"
|
||||||
|
android:layout_toRightOf="@+id/streetView"
|
||||||
|
android:ellipsize="end"
|
||||||
|
android:gravity="center_vertical"
|
||||||
|
android:maxLines="5"
|
||||||
|
tools:text="3601 E Algonquin Rd., Suite 800 Rolling Meadows, IL 60008"
|
||||||
|
android:textColor="#ff000000"
|
||||||
|
android:textSize="10sp"
|
||||||
|
android:visibility="visible" />
|
||||||
|
</RelativeLayout>
|
||||||
|
</LinearLayout>
|
||||||
5
libSafeMobile/src/main/res/values/color.xml
Normal file
5
libSafeMobile/src/main/res/values/color.xml
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<resources>
|
||||||
|
<color name="white">#FFFFFF</color>
|
||||||
|
<color name="black">#000000</color>
|
||||||
|
</resources>
|
||||||
@ -0,0 +1,93 @@
|
|||||||
|
package com.safemobile.dispatch;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.util.Log;
|
||||||
|
import android.view.LayoutInflater;
|
||||||
|
import android.view.View;
|
||||||
|
import android.widget.ImageView;
|
||||||
|
import android.widget.RelativeLayout;
|
||||||
|
import android.widget.TextView;
|
||||||
|
|
||||||
|
import androidx.annotation.NonNull;
|
||||||
|
|
||||||
|
import com.google.android.gms.maps.GoogleMap;
|
||||||
|
import com.google.android.gms.maps.model.Marker;
|
||||||
|
import com.safemobile.lib.SuperVehicle;
|
||||||
|
|
||||||
|
import java.text.DateFormat;
|
||||||
|
import java.text.SimpleDateFormat;
|
||||||
|
import java.util.Date;
|
||||||
|
import java.util.Hashtable;
|
||||||
|
import java.util.Locale;
|
||||||
|
|
||||||
|
|
||||||
|
public class GoogleMapsInfoBubble implements GoogleMap.InfoWindowAdapter {
|
||||||
|
private final String TAG = GoogleMapsInfoBubble.class.getName();
|
||||||
|
|
||||||
|
private final View mWindow;
|
||||||
|
private final Hashtable<Long, SuperVehicle> superVehHash;
|
||||||
|
private final Context context;
|
||||||
|
|
||||||
|
|
||||||
|
public GoogleMapsInfoBubble(LayoutInflater layoutInflater, Context context, Hashtable<Long, SuperVehicle> vehicles) {
|
||||||
|
this.context = context;
|
||||||
|
this.superVehHash = vehicles;
|
||||||
|
mWindow = layoutInflater.inflate(R.layout.map_marker_info_bubble, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public View getInfoWindow(@NonNull Marker marker) {
|
||||||
|
render(marker, mWindow);
|
||||||
|
return mWindow;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public View getInfoContents(@NonNull Marker marker) {
|
||||||
|
render(marker, mWindow);
|
||||||
|
return mWindow;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void render(Marker marker, View view) {
|
||||||
|
long key = 0;
|
||||||
|
|
||||||
|
try {
|
||||||
|
key = Long.parseLong(marker.getTitle());
|
||||||
|
} catch (Exception ex) {
|
||||||
|
Log.v(TAG, "Unable to parse Google Maps Info Bubble title");
|
||||||
|
}
|
||||||
|
SuperVehicle vehicle = superVehHash.get(key);
|
||||||
|
|
||||||
|
RelativeLayout rlMapInfoBubbleInfo = view.findViewById(R.id.rlMapInfoBubbleInfo);
|
||||||
|
TextView tvUnitName = view.findViewById(R.id.tvUnitName);
|
||||||
|
TextView tvGPSLocation = view.findViewById(R.id.tvGPSLocation);
|
||||||
|
TextView tvTimeAgo = view.findViewById(R.id.tvTimeAgo);
|
||||||
|
TextView tvSpeed = view.findViewById(R.id.tvSpeed);
|
||||||
|
TextView tvStreetView = view.findViewById(R.id.tvStreetView);
|
||||||
|
ImageView streetView = view.findViewById(R.id.streetView);
|
||||||
|
rlMapInfoBubbleInfo.setVisibility(View.VISIBLE);
|
||||||
|
|
||||||
|
boolean isMilitaryTime = false;
|
||||||
|
Date positionTime = new Date(vehicle.timeGMT);
|
||||||
|
|
||||||
|
|
||||||
|
String timeFormat = isMilitaryTime
|
||||||
|
? "HH:mm:ss dd.MMM.yyyy"
|
||||||
|
: "hh:mm:ss a dd.MMM.yyy";
|
||||||
|
|
||||||
|
DateFormat format = new SimpleDateFormat(timeFormat, Locale.ENGLISH);
|
||||||
|
|
||||||
|
tvTimeAgo.setText(format.format(positionTime));
|
||||||
|
|
||||||
|
tvSpeed.setText(String.format(context.getResources().getString(R.string.speedMph), vehicle.speed));
|
||||||
|
|
||||||
|
String address = vehicle.Address != null ? vehicle.Address : "";
|
||||||
|
|
||||||
|
tvStreetView.setText(address);
|
||||||
|
streetView.setVisibility(address.length() > 0 ? View.VISIBLE : View.GONE);
|
||||||
|
tvStreetView.setVisibility(address.length() > 0 ? View.VISIBLE : View.GONE);
|
||||||
|
tvUnitName.setText(vehicle.name);
|
||||||
|
tvGPSLocation.setText("[" + String.format("%.4f", vehicle.lat)
|
||||||
|
+ "," + String.format("%.4f",vehicle.lng) + "]");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@ -3,18 +3,145 @@ package com.safemobile.dispatch;
|
|||||||
import androidx.appcompat.app.AppCompatActivity;
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
|
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
|
import android.widget.ArrayAdapter;
|
||||||
|
import android.widget.ImageView;
|
||||||
|
import android.widget.LinearLayout;
|
||||||
|
import android.widget.Spinner;
|
||||||
|
import android.widget.TextView;
|
||||||
|
|
||||||
|
import com.google.android.gms.maps.GoogleMap;
|
||||||
|
import com.google.android.gms.maps.SupportMapFragment;
|
||||||
|
import com.safemobile.lib.AppParams;
|
||||||
import com.safemobile.lib.SM;
|
import com.safemobile.lib.SM;
|
||||||
|
import com.safemobile.lib.Vehicle;
|
||||||
|
|
||||||
|
import java.text.SimpleDateFormat;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Calendar;
|
||||||
|
import java.util.Date;
|
||||||
|
import java.util.Locale;
|
||||||
|
|
||||||
public class HistoryActivity extends AppCompatActivity {
|
public class HistoryActivity extends AppCompatActivity {
|
||||||
|
|
||||||
public Bundle savedInstanceState;
|
public Bundle savedInstanceState;
|
||||||
|
private TabLayoutActivity parentTab;
|
||||||
|
private GoogleMap googleMap;
|
||||||
|
private Spinner spinnerVehicle;
|
||||||
|
private ImageView changeMapType, checkTraffic, slideLayoutImage;
|
||||||
|
private LinearLayout layoutTraffic, slidelayout, layoutVehicles;
|
||||||
|
|
||||||
|
private ArrayList<Vehicle> allVehicle = new ArrayList<>();
|
||||||
|
private ArrayList<String> allVehicleNames = new ArrayList<>();
|
||||||
|
private ArrayAdapter<String> adapter;
|
||||||
|
private boolean showVehicle = true;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
this.savedInstanceState = savedInstanceState;
|
this.savedInstanceState = savedInstanceState;
|
||||||
setContentView(R.layout.tabhistory);
|
setContentView(R.layout.tabhistory);
|
||||||
|
|
||||||
|
parentTab = (TabLayoutActivity) getParent();
|
||||||
|
parentTab.historyActivity = this;
|
||||||
|
|
||||||
|
Locale locale = new Locale(AppParams.LANGUAGETMP);
|
||||||
|
Locale.setDefault(locale);
|
||||||
|
|
||||||
|
googleMap = parentTab.liveActivity.getMap();
|
||||||
|
SupportMapFragment mapFragment = (SupportMapFragment) getSupportFragmentManager()
|
||||||
|
.findFragmentById(R.id.map);
|
||||||
|
|
||||||
|
spinnerVehicle = findViewById(R.id.spinnerVehicle);
|
||||||
|
getVehicles();
|
||||||
|
|
||||||
|
adapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_item, allVehicleNames);
|
||||||
|
adapter.setDropDownViewResource(android.R.layout.simple_dropdown_item_1line);
|
||||||
|
spinnerVehicle.setAdapter(adapter);
|
||||||
|
spinnerVehicle.setSelection(0);
|
||||||
|
|
||||||
|
changeMapType();
|
||||||
|
changeTraffic();
|
||||||
|
|
||||||
|
slidelayout = findViewById(R.id.slidelayout);
|
||||||
|
slideLayoutImage = findViewById(R.id.slideLayoutImage);
|
||||||
|
layoutVehicles = findViewById(R.id.layoutBig);
|
||||||
|
// slidelayout.setOnTouchListener((v, event) -> {
|
||||||
|
// if (showVehicle) {
|
||||||
|
// layoutVehicles.setVisibility(View.GONE);
|
||||||
|
// slideLayoutImage.setImageResource(R.drawable.arrow_right);
|
||||||
|
// showVehicle = false;
|
||||||
|
// } else {
|
||||||
|
// layoutVehicles.setVisibility(View.VISIBLE);
|
||||||
|
// slideLayoutImage.setImageResource(R.drawable.arrow_left);
|
||||||
|
// showVehicle = true;
|
||||||
|
// }
|
||||||
|
// return false;
|
||||||
|
// });
|
||||||
|
|
||||||
|
setDate();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void setDate() {
|
||||||
|
Calendar calendar = Calendar.getInstance();
|
||||||
|
Date endDate = calendar.getTime();
|
||||||
|
calendar.add(Calendar.DATE, -1);
|
||||||
|
Date startDate = calendar.getTime();
|
||||||
|
|
||||||
|
LinearLayout layoutStartPicker = findViewById(R.id.layoutStartPicker);
|
||||||
|
TextView textViewDate = findViewById(R.id.textViewStartDate);
|
||||||
|
|
||||||
|
textViewDate.setText(new SimpleDateFormat("HH:mm, dd.MM.yyyy").format(startDate));
|
||||||
|
// layoutStartPicker.setOnTouchListener((v, event) -> {
|
||||||
|
// showDialog(layoutStartPicker);
|
||||||
|
// return false;
|
||||||
|
// });
|
||||||
|
|
||||||
|
// layoutEndPicker.setOnTouchListener(new OnTouchListener() {
|
||||||
|
// @Override
|
||||||
|
// public boolean onTouch(View v, MotionEvent event) {
|
||||||
|
// showDialog(layoutEndPicker);
|
||||||
|
// return false;
|
||||||
|
// }
|
||||||
|
// });
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private void changeTraffic() {
|
||||||
|
ImageView changeTrafficImageView = findViewById(R.id.changeTraffic);
|
||||||
|
changeTrafficImageView.setOnClickListener(v -> {
|
||||||
|
if (googleMap.isTrafficEnabled()) {
|
||||||
|
changeTrafficImageView.setImageResource(R.drawable.traffic_off);
|
||||||
|
googleMap.setTrafficEnabled(false);
|
||||||
|
} else {
|
||||||
|
changeTrafficImageView.setImageResource(R.drawable.traffic);
|
||||||
|
googleMap.setTrafficEnabled(true);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private void changeMapType() {
|
||||||
|
changeMapType = findViewById(R.id.changeMapType);
|
||||||
|
ImageView changeMapTypeImageView = findViewById(R.id.changeMapType);
|
||||||
|
changeMapType.setOnClickListener(view -> {
|
||||||
|
if (googleMap.getMapType() == GoogleMap.MAP_TYPE_SATELLITE) {
|
||||||
|
changeMapTypeImageView.setImageResource(R.drawable.satellite);
|
||||||
|
googleMap.setMapType(GoogleMap.MAP_TYPE_SATELLITE);
|
||||||
|
} else {
|
||||||
|
changeMapTypeImageView.setImageResource(R.drawable.map);
|
||||||
|
googleMap.setMapType(GoogleMap.MAP_TYPE_NORMAL);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public void getVehicles() {
|
||||||
|
try {
|
||||||
|
for (Vehicle vehicle : parentTab.getAllVehicle()) {
|
||||||
|
allVehicleNames.add(vehicle.name);
|
||||||
|
allVehicle.add(vehicle);
|
||||||
|
}
|
||||||
|
} catch (Exception ex) { }
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void UpdateMap() {
|
public void UpdateMap() {
|
||||||
|
|||||||
@ -42,9 +42,8 @@ public class IconContextMenu implements DialogInterface.OnCancelListener,
|
|||||||
|
|
||||||
private static final int LIST_PREFERED_HEIGHT = 65;
|
private static final int LIST_PREFERED_HEIGHT = 65;
|
||||||
|
|
||||||
private IconMenuAdapter menuAdapter = null;
|
private IconMenuAdapter menuAdapter;
|
||||||
private Activity parentActivity = null;
|
private Activity parentActivity;
|
||||||
private int dialogId = 0;
|
|
||||||
|
|
||||||
private IconContextMenuOnClickListener clickHandler = null;
|
private IconContextMenuOnClickListener clickHandler = null;
|
||||||
|
|
||||||
@ -55,7 +54,6 @@ public class IconContextMenu implements DialogInterface.OnCancelListener,
|
|||||||
*/
|
*/
|
||||||
public IconContextMenu(Activity parent, int id) {
|
public IconContextMenu(Activity parent, int id) {
|
||||||
this.parentActivity = parent;
|
this.parentActivity = parent;
|
||||||
this.dialogId = id;
|
|
||||||
|
|
||||||
menuAdapter = new IconMenuAdapter(parentActivity);
|
menuAdapter = new IconMenuAdapter(parentActivity);
|
||||||
}
|
}
|
||||||
@ -89,19 +87,13 @@ public class IconContextMenu implements DialogInterface.OnCancelListener,
|
|||||||
public Dialog createMenu(String menuItitle) {
|
public Dialog createMenu(String menuItitle) {
|
||||||
final AlertDialog.Builder builder = new AlertDialog.Builder(parentActivity);
|
final AlertDialog.Builder builder = new AlertDialog.Builder(parentActivity);
|
||||||
builder.setTitle(menuItitle);
|
builder.setTitle(menuItitle);
|
||||||
builder.setAdapter(menuAdapter, new DialogInterface.OnClickListener() {
|
builder.setAdapter(menuAdapter, (dialoginterface, i) -> {
|
||||||
@Override
|
IconContextMenuItem item = (IconContextMenuItem) menuAdapter.getItem(i);
|
||||||
public void onClick(DialogInterface dialoginterface, int i) {
|
if (clickHandler != null)
|
||||||
IconContextMenuItem item = (IconContextMenuItem) menuAdapter.getItem(i);
|
clickHandler.onClick(item.actionTag);
|
||||||
|
|
||||||
if (clickHandler != null) {
|
|
||||||
clickHandler.onClick(item.actionTag);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
|
||||||
builder.setInverseBackgroundForced(true);
|
builder.setInverseBackgroundForced(true);
|
||||||
|
|
||||||
AlertDialog dialog = builder.create();
|
AlertDialog dialog = builder.create();
|
||||||
dialog.setOnCancelListener(this);
|
dialog.setOnCancelListener(this);
|
||||||
dialog.setOnDismissListener(this);
|
dialog.setOnDismissListener(this);
|
||||||
@ -117,7 +109,7 @@ public class IconContextMenu implements DialogInterface.OnCancelListener,
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void cleanup() {
|
private void cleanup() {
|
||||||
parentActivity.dismissDialog(dialogId);
|
// parentActivity.dismissDialog(dialogId);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -131,7 +123,7 @@ public class IconContextMenu implements DialogInterface.OnCancelListener,
|
|||||||
* Menu-like list adapter with icon
|
* Menu-like list adapter with icon
|
||||||
*/
|
*/
|
||||||
protected class IconMenuAdapter extends BaseAdapter {
|
protected class IconMenuAdapter extends BaseAdapter {
|
||||||
private Context context = null;
|
private Context context;
|
||||||
|
|
||||||
private ArrayList<IconContextMenuItem> mItems = new ArrayList<IconContextMenuItem>();
|
private ArrayList<IconContextMenuItem> mItems = new ArrayList<IconContextMenuItem>();
|
||||||
|
|
||||||
@ -193,6 +185,7 @@ public class IconContextMenu implements DialogInterface.OnCancelListener,
|
|||||||
textView.setTag(item);
|
textView.setTag(item);
|
||||||
textView.setText(item.text);
|
textView.setText(item.text);
|
||||||
textView.setCompoundDrawablesWithIntrinsicBounds(item.image, null, null, null);
|
textView.setCompoundDrawablesWithIntrinsicBounds(item.image, null, null, null);
|
||||||
|
textView.setTextColor(R.color.black);
|
||||||
|
|
||||||
return textView;
|
return textView;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -9,13 +9,19 @@ import android.content.Intent;
|
|||||||
import android.content.IntentFilter;
|
import android.content.IntentFilter;
|
||||||
import android.content.res.Configuration;
|
import android.content.res.Configuration;
|
||||||
import android.content.res.Resources;
|
import android.content.res.Resources;
|
||||||
|
import android.graphics.Bitmap;
|
||||||
|
import android.graphics.BitmapFactory;
|
||||||
|
import android.graphics.Canvas;
|
||||||
|
import android.graphics.Color;
|
||||||
|
import android.graphics.Matrix;
|
||||||
|
import android.graphics.Paint;
|
||||||
|
import android.graphics.Rect;
|
||||||
import android.graphics.Typeface;
|
import android.graphics.Typeface;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.os.Handler;
|
import android.os.Handler;
|
||||||
import android.os.Looper;
|
import android.os.Looper;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.Window;
|
import android.view.Window;
|
||||||
import android.widget.AdapterView;
|
|
||||||
import android.widget.Button;
|
import android.widget.Button;
|
||||||
import android.widget.GridView;
|
import android.widget.GridView;
|
||||||
import android.widget.ImageButton;
|
import android.widget.ImageButton;
|
||||||
@ -26,11 +32,13 @@ import android.widget.Toast;
|
|||||||
|
|
||||||
import androidx.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
|
|
||||||
import com.google.android.gms.maps.CameraUpdateFactory;
|
|
||||||
import com.google.android.gms.maps.GoogleMap;
|
import com.google.android.gms.maps.GoogleMap;
|
||||||
import com.google.android.gms.maps.OnMapReadyCallback;
|
import com.google.android.gms.maps.OnMapReadyCallback;
|
||||||
import com.google.android.gms.maps.SupportMapFragment;
|
import com.google.android.gms.maps.SupportMapFragment;
|
||||||
|
import com.google.android.gms.maps.model.BitmapDescriptor;
|
||||||
|
import com.google.android.gms.maps.model.BitmapDescriptorFactory;
|
||||||
import com.google.android.gms.maps.model.LatLng;
|
import com.google.android.gms.maps.model.LatLng;
|
||||||
|
import com.google.android.gms.maps.model.Marker;
|
||||||
import com.google.android.gms.maps.model.MarkerOptions;
|
import com.google.android.gms.maps.model.MarkerOptions;
|
||||||
import com.safemobile.activities.AbstractLiveActivity;
|
import com.safemobile.activities.AbstractLiveActivity;
|
||||||
import com.safemobile.activities.AbstractSDParentActivity;
|
import com.safemobile.activities.AbstractSDParentActivity;
|
||||||
@ -94,6 +102,7 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
|
|||||||
//value poll
|
//value poll
|
||||||
private double latPoll = 0;
|
private double latPoll = 0;
|
||||||
private double lngPoll = 0;
|
private double lngPoll = 0;
|
||||||
|
private ArrayList<Marker> markers = new ArrayList<>();
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -130,12 +139,11 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
|
|||||||
mapFragment.getMapAsync(this);
|
mapFragment.getMapAsync(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// create on vehicle long click menu
|
// create on vehicle long click menu
|
||||||
createIconContextMenu();
|
createIconContextMenu();
|
||||||
|
|
||||||
// image View for changing map type satellite or map
|
// image View for changing map type satellite or map
|
||||||
ImageView changeMapTypeImageView = (ImageView) findViewById(R.id.changeMapType);
|
ImageView changeMapTypeImageView = findViewById(R.id.changeMapType);
|
||||||
changeMapTypeImageView.setOnClickListener(v -> {
|
changeMapTypeImageView.setOnClickListener(v -> {
|
||||||
if (googleMap.getMapType() == GoogleMap.MAP_TYPE_SATELLITE) {
|
if (googleMap.getMapType() == GoogleMap.MAP_TYPE_SATELLITE) {
|
||||||
changeMapTypeImageView.setImageResource(R.drawable.satellite);
|
changeMapTypeImageView.setImageResource(R.drawable.satellite);
|
||||||
@ -146,7 +154,7 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
ImageView changeTrafficImageView = (ImageView) findViewById(R.id.changeTraffic);
|
ImageView changeTrafficImageView = findViewById(R.id.changeTraffic);
|
||||||
changeTrafficImageView.setOnClickListener(v -> {
|
changeTrafficImageView.setOnClickListener(v -> {
|
||||||
if (googleMap.isTrafficEnabled()) {
|
if (googleMap.isTrafficEnabled()) {
|
||||||
changeTrafficImageView.setImageResource(R.drawable.traffic_off);
|
changeTrafficImageView.setImageResource(R.drawable.traffic_off);
|
||||||
@ -158,12 +166,12 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
|
|||||||
});
|
});
|
||||||
|
|
||||||
// change tab header font
|
// change tab header font
|
||||||
TextView textView1 = (TextView) findViewById(R.id.textView1);
|
TextView textView1 = findViewById(R.id.textView1);
|
||||||
textView1.setTypeface(Typeface.createFromAsset(getAssets(), "Sketch_Block.ttf"));
|
textView1.setTypeface(Typeface.createFromAsset(getAssets(), "Sketch_Block.ttf"));
|
||||||
textView1.setTextSize(24);
|
textView1.setTextSize(24);
|
||||||
|
|
||||||
// get grid view and set empty data adapter
|
// get grid view and set empty data adapter
|
||||||
gridVehicle = (GridView) findViewById(R.id.gridVehicle);
|
gridVehicle = findViewById(R.id.gridVehicle);
|
||||||
|
|
||||||
if (AppParams.DEMO) {
|
if (AppParams.DEMO) {
|
||||||
disabledVehicles = new ArrayList<>();
|
disabledVehicles = new ArrayList<>();
|
||||||
@ -185,14 +193,16 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
|
|||||||
threadUI.start();
|
threadUI.start();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
// get vehicle menu creation
|
// get vehicle menu creation
|
||||||
gridVehicle.setOnItemLongClickListener(itemLongClickHandler);
|
gridVehicle.setOnItemLongClickListener((adapterView, view, i, l) -> {
|
||||||
|
contextMenuPosition = position;
|
||||||
|
iconContextMenu.createMenu(getString(R.string.options)).show();
|
||||||
|
return true;
|
||||||
|
});
|
||||||
|
|
||||||
|
LinearLayout slideLayout = findViewById(R.id.slidelayout);
|
||||||
LinearLayout slideLayout = (LinearLayout) findViewById(R.id.slidelayout);
|
ImageView slideLayoutImageView = findViewById(R.id.slideLayoutImage);
|
||||||
ImageView slideLayoutImageView = (ImageView) findViewById(R.id.slideLayoutImage);
|
LinearLayout linearLayoutVehicles = findViewById(R.id.layoutBig);
|
||||||
LinearLayout linearLayoutVehicles = (LinearLayout) findViewById(R.id.layoutBig);
|
|
||||||
slideLayout.setOnClickListener(v -> {
|
slideLayout.setOnClickListener(v -> {
|
||||||
if (showVehicle) {
|
if (showVehicle) {
|
||||||
linearLayoutVehicles.setVisibility(View.GONE);
|
linearLayoutVehicles.setVisibility(View.GONE);
|
||||||
@ -205,7 +215,7 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
imageViewCheckAll = (ImageButton) findViewById(R.id.imageCheckAll);
|
imageViewCheckAll = findViewById(R.id.imageCheckAll);
|
||||||
imageViewCheckAll.setSelected(false);
|
imageViewCheckAll.setSelected(false);
|
||||||
imageViewCheckAll.setOnClickListener(arg0 -> {
|
imageViewCheckAll.setOnClickListener(arg0 -> {
|
||||||
for (int i = 0; i < displayedVehicles.size(); i++)
|
for (int i = 0; i < displayedVehicles.size(); i++)
|
||||||
@ -223,7 +233,7 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
|
|||||||
|
|
||||||
Enumeration<Long> keyList = getParentTab().getSuperVehHash().keys();
|
Enumeration<Long> keyList = getParentTab().getSuperVehHash().keys();
|
||||||
while (keyList.hasMoreElements()) {
|
while (keyList.hasMoreElements()) {
|
||||||
(Objects.requireNonNull(getParentTab().getSuperVehHash().get((long) keyList.nextElement()))).needUpdate = true;
|
(Objects.requireNonNull(getParentTab().getSuperVehHash().get(keyList.nextElement()))).needUpdate = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
// change button title
|
// change button title
|
||||||
@ -247,7 +257,7 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
|
|||||||
displayVehicle(true, LAT_OUTLIMIT, LNG_OUTLIMIT);
|
displayVehicle(true, LAT_OUTLIMIT, LNG_OUTLIMIT);
|
||||||
});
|
});
|
||||||
|
|
||||||
displayButton = (Button) findViewById(R.id.buttonDisplay);
|
displayButton = findViewById(R.id.buttonDisplay);
|
||||||
displayButton.setText(getString(R.string.displayAll));
|
displayButton.setText(getString(R.string.displayAll));
|
||||||
|
|
||||||
|
|
||||||
@ -259,7 +269,7 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
|
|||||||
|
|
||||||
Enumeration<Long> keyList = getParentTab().getSuperVehHash().keys();
|
Enumeration<Long> keyList = getParentTab().getSuperVehHash().keys();
|
||||||
while (keyList.hasMoreElements())
|
while (keyList.hasMoreElements())
|
||||||
(Objects.requireNonNull(getParentTab().getSuperVehHash().get((long) keyList.nextElement()))).needUpdate = true;
|
(Objects.requireNonNull(getParentTab().getSuperVehHash().get(keyList.nextElement()))).needUpdate = true;
|
||||||
|
|
||||||
// change button title
|
// change button title
|
||||||
if (displayButton.getText().toString().equals(getString(R.string.displayAll))) {
|
if (displayButton.getText().toString().equals(getString(R.string.displayAll))) {
|
||||||
@ -297,11 +307,8 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
|
|||||||
@Override
|
@Override
|
||||||
public void onMapReady(@NonNull GoogleMap googleMap) {
|
public void onMapReady(@NonNull GoogleMap googleMap) {
|
||||||
this.googleMap = googleMap;
|
this.googleMap = googleMap;
|
||||||
|
GoogleMapsInfoBubble infoBubble = new GoogleMapsInfoBubble(getLayoutInflater(), this, getParentTab().getSuperVehHash());
|
||||||
// Add a marker in Sydney and move the camera
|
this.googleMap.setInfoWindowAdapter(infoBubble);
|
||||||
LatLng sydney = new LatLng(-34, 151);
|
|
||||||
this.googleMap.addMarker(new MarkerOptions().position(sydney).title("Marker in Sydney"));
|
|
||||||
this.googleMap.moveCamera(CameraUpdateFactory.newLatLng(sydney));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -433,36 +440,101 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* create context menu
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
public Dialog onCreateDialog(int id) {
|
|
||||||
if (id == 1) {
|
|
||||||
return iconContextMenu.createMenu(getString(R.string.options));
|
|
||||||
}
|
|
||||||
return super.onCreateDialog(id);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* list item long click handler
|
|
||||||
* used to show the context menu
|
|
||||||
*/
|
|
||||||
private final AdapterView.OnItemLongClickListener itemLongClickHandler = ((parent, view, position, id) -> {
|
|
||||||
// save position
|
|
||||||
contextMenuPosition = position;
|
|
||||||
showDialog(1);
|
|
||||||
return true;
|
|
||||||
});
|
|
||||||
|
|
||||||
public void displayVehicle(boolean withZoom, double latZoom, double lngZoom) {
|
public void displayVehicle(boolean withZoom, double latZoom, double lngZoom) {
|
||||||
//TODO: add makers for vehicles
|
if (googleMap != null) {
|
||||||
|
String openWindow = "";
|
||||||
|
for (Marker marker : markers) {
|
||||||
|
if (marker.isInfoWindowShown()) {
|
||||||
|
openWindow = marker.getTitle();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
googleMap.clear();
|
||||||
|
|
||||||
|
for (int i = 0; i < displayedVehicles.size(); i++) {
|
||||||
|
if (displayedVehicles.get(i)) {
|
||||||
|
SuperVehicle tmpSuper = getParentTab().getSuperVehHash().get(Long.valueOf(liveVehicle.get(i).imei));
|
||||||
|
|
||||||
|
if (tmpSuper != null) {
|
||||||
|
LatLng newLocation = new LatLng(tmpSuper.lat, tmpSuper.lng);
|
||||||
|
MarkerOptions markerOptions = new MarkerOptions().position(newLocation).title(liveVehicle.get(i).imei);
|
||||||
|
|
||||||
|
BitmapDescriptor markerIcon = getProperBitmap(tmpSuper.getLargeIcon(), tmpSuper.name);
|
||||||
|
markerOptions.icon(markerIcon);
|
||||||
|
|
||||||
|
Marker marker = this.googleMap.addMarker(markerOptions);
|
||||||
|
if (openWindow.equals(marker.getTitle()))
|
||||||
|
marker.showInfoWindow();
|
||||||
|
|
||||||
|
markers.add(marker);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void showOpenedBalloon(boolean demo) {
|
public void showOpenedBalloon(boolean demo) {
|
||||||
//TODO: add show balloon
|
//TODO: add show balloon
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private BitmapDescriptor getProperBitmap(int largeIcon, String text) {
|
||||||
|
Bitmap bitmap = BitmapFactory.decodeResource(getResources(), largeIcon);
|
||||||
|
Bitmap textBitmap = getTextAsDrawable(this, text);
|
||||||
|
Bitmap b3 = overlay(bitmap, textBitmap);
|
||||||
|
return BitmapDescriptorFactory.fromBitmap(b3);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Bitmap overlay(Bitmap bmp1, Bitmap bmp2) {
|
||||||
|
int maxWidth = Math.max(bmp1.getWidth(), bmp2.getWidth());
|
||||||
|
|
||||||
|
Bitmap bmOverlay = Bitmap.createBitmap(maxWidth, bmp1.getHeight() + bmp2.getHeight(), bmp1.getConfig());
|
||||||
|
Canvas canvas = new Canvas(bmOverlay);
|
||||||
|
canvas.drawBitmap(bmp1, new Matrix(), null);
|
||||||
|
canvas.drawBitmap(bmp2, 0, bmp1.getHeight(), null);
|
||||||
|
bmp1.recycle();
|
||||||
|
bmp2.recycle();
|
||||||
|
return bmOverlay;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Bitmap getTextAsDrawable(Context context, String text) {
|
||||||
|
Typeface tf = Typeface.create("Helvetica", Typeface.BOLD);
|
||||||
|
|
||||||
|
Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG);
|
||||||
|
paint.setColor(Color.WHITE);
|
||||||
|
paint.setTypeface(tf);
|
||||||
|
paint.setTextSize(convertToPixels(context, 16));
|
||||||
|
|
||||||
|
Rect textRect = new Rect();
|
||||||
|
paint.getTextBounds(text, 0, text.length(), textRect);
|
||||||
|
|
||||||
|
Bitmap bitmap = Bitmap.createBitmap(textRect.width(), textRect.height() + 5,
|
||||||
|
Bitmap.Config.ARGB_8888);
|
||||||
|
|
||||||
|
Canvas canvas = new Canvas(bitmap);
|
||||||
|
paint.setColor(getResources().getColor(R.color.cardview_dark_background));
|
||||||
|
canvas.drawRect(0, 0, bitmap.getWidth(), bitmap.getHeight(), paint);
|
||||||
|
|
||||||
|
|
||||||
|
float scale = context.getResources().getDisplayMetrics().density;
|
||||||
|
// text color - #3D3D3D
|
||||||
|
paint.setColor(Color.rgb(255, 255, 255));
|
||||||
|
// text size in pixels
|
||||||
|
|
||||||
|
// draw text to the Canvas center
|
||||||
|
Rect bounds = new Rect();
|
||||||
|
paint.getTextBounds(text, 0, text.length(), bounds);
|
||||||
|
int x = (bitmap.getWidth() - bounds.width()) / 2;
|
||||||
|
int y = (bitmap.getHeight() + bounds.height()) / 2;
|
||||||
|
|
||||||
|
canvas.drawText(text, x, y, paint);
|
||||||
|
|
||||||
|
return bitmap;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int convertToPixels(Context context, int nDP) {
|
||||||
|
final float conversionScale = context.getResources().getDisplayMetrics().density;
|
||||||
|
return (int) ((nDP * conversionScale) + 0.5f);
|
||||||
|
}
|
||||||
|
|
||||||
public void showLoadingDialog(String message) {
|
public void showLoadingDialog(String message) {
|
||||||
loadingDialog = new Dialog(context);
|
loadingDialog = new Dialog(context);
|
||||||
loadingDialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
|
loadingDialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
|
||||||
@ -470,9 +542,9 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
|
|||||||
loadingDialog.setCancelable(true);
|
loadingDialog.setCancelable(true);
|
||||||
loadingDialog.setCanceledOnTouchOutside(false);
|
loadingDialog.setCanceledOnTouchOutside(false);
|
||||||
|
|
||||||
Button cancel = (Button) loadingDialog.findViewById(R.id.buttonCancel);
|
Button cancel = loadingDialog.findViewById(R.id.buttonCancel);
|
||||||
cancel.setVisibility(View.GONE);
|
cancel.setVisibility(View.GONE);
|
||||||
TextView textView1 = (TextView) loadingDialog.findViewById(R.id.textView1);
|
TextView textView1 = loadingDialog.findViewById(R.id.textView1);
|
||||||
textView1.setText(message);
|
textView1.setText(message);
|
||||||
|
|
||||||
loadingDialog.show();
|
loadingDialog.show();
|
||||||
@ -501,8 +573,7 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
|
|||||||
disabledVehicles.add(!veh.status);
|
disabledVehicles.add(!veh.status);
|
||||||
|
|
||||||
// add vehicle to hash Table according to driver_id
|
// add vehicle to hash Table according to driver_id
|
||||||
if (tableHashOverlay.get((int) veh.driver_id) == null) // if doesn't exist
|
if (tableHashOverlay.get((int) veh.driver_id) == null) {
|
||||||
{
|
|
||||||
ArrayList<SuperVehicle> array = new ArrayList<>();
|
ArrayList<SuperVehicle> array = new ArrayList<>();
|
||||||
SuperVehicle superVehicle = new SuperVehicle(veh.sc_id, veh.imei, veh.lp, veh.name, veh.driver_id, veh.time_route, veh.GPS_reporting_interval, veh.is_stolen);
|
SuperVehicle superVehicle = new SuperVehicle(veh.sc_id, veh.imei, veh.lp, veh.name, veh.driver_id, veh.time_route, veh.GPS_reporting_interval, veh.is_stolen);
|
||||||
array.add(superVehicle);
|
array.add(superVehicle);
|
||||||
@ -519,7 +590,6 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
|
|||||||
}
|
}
|
||||||
|
|
||||||
// set adapter
|
// set adapter
|
||||||
|
|
||||||
adapter = new VehiclesGridViewAdapter(activity, context, list, disabledVehicles);
|
adapter = new VehiclesGridViewAdapter(activity, context, list, disabledVehicles);
|
||||||
adapter.notifyDataSetChanged();
|
adapter.notifyDataSetChanged();
|
||||||
|
|
||||||
@ -538,7 +608,6 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
|
|||||||
// show vehicles in gridView
|
// show vehicles in gridView
|
||||||
private void updateResultsUI() {
|
private void updateResultsUI() {
|
||||||
gridVehicle.setAdapter(adapter);
|
gridVehicle.setAdapter(adapter);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// hide loading dialog
|
// hide loading dialog
|
||||||
loadingDialog.cancel();
|
loadingDialog.cancel();
|
||||||
@ -576,7 +645,6 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
|
|||||||
pollReceived(position,lat,lng);
|
pollReceived(position,lat,lng);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public void updatePosition(int pos) {
|
public void updatePosition(int pos) {
|
||||||
contextMenuPosition = pos;
|
contextMenuPosition = pos;
|
||||||
}
|
}
|
||||||
@ -598,11 +666,9 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
|
|||||||
final Runnable updateOptionsRUN = this::updateOptionsUI;
|
final Runnable updateOptionsRUN = this::updateOptionsUI;
|
||||||
|
|
||||||
private void updateOptionsUI() {
|
private void updateOptionsUI() {
|
||||||
|
|
||||||
SM.Debug("REFRESHDisableEnable" + (Boolean.TRUE.equals(disabledVehicles.get(contextMenuPosition)) ? "true" : "false"));
|
SM.Debug("REFRESHDisableEnable" + (Boolean.TRUE.equals(disabledVehicles.get(contextMenuPosition)) ? "true" : "false"));
|
||||||
// change Enable/Disable in adapter
|
// change Enable/Disable in adapter
|
||||||
adapter.changeDisabled(contextMenuPosition, disabledVehicles.get(contextMenuPosition));
|
adapter.changeDisabled(contextMenuPosition, disabledVehicles.get(contextMenuPosition));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -692,7 +758,6 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
|
|||||||
// zone and channel change intent
|
// zone and channel change intent
|
||||||
IntentFilter intentFilter = new IntentFilter(OperationCodes.UNIT_STATUS_UPDATE + "");
|
IntentFilter intentFilter = new IntentFilter(OperationCodes.UNIT_STATUS_UPDATE + "");
|
||||||
this.registerReceiver(mReceiver, intentFilter);
|
this.registerReceiver(mReceiver, intentFilter);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//The BroadcastReceiver that listens for Notification broadcasts
|
//The BroadcastReceiver that listens for Notification broadcasts
|
||||||
@ -723,4 +788,9 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public GoogleMap getMap() {
|
||||||
|
return googleMap;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@ -265,11 +265,11 @@ public class TabLayoutActivity extends AbstractSDParentActivity{
|
|||||||
|
|
||||||
tabHost = getTabHost(); // The activity TabHost
|
tabHost = getTabHost(); // The activity TabHost
|
||||||
tabHost.setTag("Tab Panel");
|
tabHost.setTag("Tab Panel");
|
||||||
tabWidget = (TabWidget) findViewById(android.R.id.tabs);
|
tabWidget = findViewById(android.R.id.tabs);
|
||||||
tabWidget.setVisibility(View.GONE);
|
tabWidget.setVisibility(View.GONE);
|
||||||
|
|
||||||
intent = new Intent[7];
|
intent = new Intent[8];
|
||||||
tabspecs = new TabSpec[7];
|
tabspecs = new TabSpec[8];
|
||||||
|
|
||||||
// add live tab
|
// add live tab
|
||||||
try
|
try
|
||||||
@ -288,23 +288,6 @@ public class TabLayoutActivity extends AbstractSDParentActivity{
|
|||||||
.setContent(intent[0]);
|
.setContent(intent[0]);
|
||||||
}
|
}
|
||||||
|
|
||||||
// add history tab
|
|
||||||
try
|
|
||||||
{
|
|
||||||
//intent[1] = new Intent(context, HistoryActivity.class);
|
|
||||||
//tabspecs[1] = tabHost.newTabSpec("History")
|
|
||||||
// .setIndicator("History", res.getDrawable(R.drawable.ic_tab_history_selected))
|
|
||||||
// .setContent(intent[1]);
|
|
||||||
}
|
|
||||||
catch(NoClassDefFoundError e)
|
|
||||||
{
|
|
||||||
// exception when GoogleApi not exists
|
|
||||||
//intent[1] = new Intent(context, AbstractEmptyActivity.class);
|
|
||||||
//tabspecs[1] = tabHost.newTabSpec("History")
|
|
||||||
// .setIndicator("History", res.getDrawable(R.drawable.ic_tab_history_selected))
|
|
||||||
// .setContent(intent[1]);
|
|
||||||
}
|
|
||||||
|
|
||||||
// add text tab
|
// add text tab
|
||||||
intent[1] = new Intent(context, MessagesActivity.class);
|
intent[1] = new Intent(context, MessagesActivity.class);
|
||||||
tabspecs[1] = tabHost.newTabSpec("Text")
|
tabspecs[1] = tabHost.newTabSpec("Text")
|
||||||
@ -341,6 +324,21 @@ public class TabLayoutActivity extends AbstractSDParentActivity{
|
|||||||
.setIndicator("SafeMobile", res.getDrawable(AppParams.DEMO ? R.drawable.icon_demo : R.drawable.ic_launcher))
|
.setIndicator("SafeMobile", res.getDrawable(AppParams.DEMO ? R.drawable.icon_demo : R.drawable.ic_launcher))
|
||||||
.setContent(intent[6]);
|
.setContent(intent[6]);
|
||||||
|
|
||||||
|
// add history tab
|
||||||
|
try
|
||||||
|
{
|
||||||
|
intent[7] = new Intent(context, HistoryActivity.class);
|
||||||
|
tabspecs[7] = tabHost.newTabSpec("History")
|
||||||
|
.setIndicator("History", res.getDrawable(R.drawable.ic_tab_history_selected))
|
||||||
|
.setContent(intent[7]);
|
||||||
|
} catch(NoClassDefFoundError e) {
|
||||||
|
// exception when GoogleApi not exists
|
||||||
|
intent[7] = new Intent(context, AbstractEmptyActivity.class);
|
||||||
|
tabspecs[7] = tabHost.newTabSpec("History")
|
||||||
|
.setIndicator("History", res.getDrawable(R.drawable.ic_tab_history_selected))
|
||||||
|
.setContent(intent[1]);
|
||||||
|
}
|
||||||
|
|
||||||
// add tab in tabHost
|
// add tab in tabHost
|
||||||
// for(int i=0;i<7;i++
|
// for(int i=0;i<7;i++
|
||||||
for (TabSpec tab: tabspecs) {
|
for (TabSpec tab: tabspecs) {
|
||||||
@ -353,58 +351,61 @@ public class TabLayoutActivity extends AbstractSDParentActivity{
|
|||||||
imageViewSlideMenu = (ImageView) findViewById(R.id.imageViewSlideMenu);
|
imageViewSlideMenu = (ImageView) findViewById(R.id.imageViewSlideMenu);
|
||||||
|
|
||||||
// get Live Button
|
// get Live Button
|
||||||
buttonLive = (ImageButton) findViewById(R.id.buttonLive);
|
buttonLive = findViewById(R.id.buttonLive);
|
||||||
buttonLive.setOnClickListener(new OnClickListener() {
|
buttonLive.setOnClickListener(v -> {
|
||||||
@Override
|
if (!buttonLive.isSelected()) {
|
||||||
public void onClick(View v) {
|
// select button
|
||||||
if(!buttonLive.isSelected())
|
buttonLive.setSelected(true);
|
||||||
{
|
// deselect other buttons
|
||||||
// select button
|
buttonAlarms.setSelected(false);
|
||||||
buttonLive.setSelected(true);
|
buttonHistory.setSelected(false);
|
||||||
// deselect other buttons
|
buttonRadio.setSelected(false);
|
||||||
buttonAlarms.setSelected(false);
|
buttonRecordings.setSelected(false);
|
||||||
buttonHistory.setSelected(false);
|
buttonSetup.setSelected(false);
|
||||||
buttonRadio.setSelected(false);
|
buttonText.setSelected(false);
|
||||||
buttonRecordings.setSelected(false);
|
// select tab
|
||||||
buttonSetup.setSelected(false);
|
tabHost.setCurrentTabByTag("Live");
|
||||||
buttonText.setSelected(false);
|
AppParams.crtTab = AppParams.Tabs.live;
|
||||||
// select tab
|
|
||||||
tabHost.setCurrentTabByTag("Live");
|
|
||||||
AppParams.crtTab = AppParams.Tabs.live;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// get History Button
|
// get History Button
|
||||||
buttonHistory = (ImageButton) findViewById(R.id.buttonHistory);
|
buttonHistory = findViewById(R.id.buttonHistory);
|
||||||
buttonHistory.setOnClickListener(new OnClickListener() {
|
buttonHistory.setOnClickListener(v -> {
|
||||||
@Override
|
if (!buttonHistory.isSelected()) {
|
||||||
public void onClick(View v) {
|
// select button
|
||||||
if(!buttonHistory.isSelected())
|
buttonHistory.setSelected(true);
|
||||||
{
|
// deselect other buttons
|
||||||
// select button
|
buttonAlarms.setSelected(false);
|
||||||
buttonHistory.setSelected(true);
|
buttonLive.setSelected(false);
|
||||||
// deselect other buttons
|
buttonRadio.setSelected(false);
|
||||||
buttonAlarms.setSelected(false);
|
buttonRecordings.setSelected(false);
|
||||||
buttonLive.setSelected(false);
|
buttonSetup.setSelected(false);
|
||||||
buttonRadio.setSelected(false);
|
buttonText.setSelected(false);
|
||||||
buttonRecordings.setSelected(false);
|
// select tab
|
||||||
buttonSetup.setSelected(false);
|
tabHost.setCurrentTabByTag("History");
|
||||||
buttonText.setSelected(false);
|
AppParams.crtTab = AppParams.Tabs.history;
|
||||||
// select tab
|
|
||||||
tabHost.setCurrentTabByTag("History");
|
|
||||||
AppParams.crtTab = AppParams.Tabs.history;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// get Text Button
|
// get Text Button
|
||||||
buttonText= (ImageButton) findViewById(R.id.buttonText);
|
buttonText= findViewById(R.id.buttonText);
|
||||||
buttonText.setOnClickListener(new OnClickListener() {
|
buttonText.setOnClickListener(v -> {
|
||||||
@Override
|
if (!buttonText.isSelected()) {
|
||||||
public void onClick(View v) {
|
// select button
|
||||||
if(!buttonText.isSelected())
|
buttonText.setSelected(true);
|
||||||
{
|
// deselect other buttons
|
||||||
|
buttonAlarms.setSelected(false);
|
||||||
|
buttonLive.setSelected(false);
|
||||||
|
buttonRadio.setSelected(false);
|
||||||
|
buttonRecordings.setSelected(false);
|
||||||
|
buttonSetup.setSelected(false);
|
||||||
|
buttonHistory.setSelected(false);
|
||||||
|
// select tab
|
||||||
|
tabHost.setCurrentTabByTag("Text");
|
||||||
|
AppParams.crtTab = AppParams.Tabs.message;
|
||||||
|
|
||||||
|
if (AppParams.DEMO && messageActivity.allVehicle.size()== 0) {
|
||||||
// select button
|
// select button
|
||||||
buttonText.setSelected(true);
|
buttonText.setSelected(true);
|
||||||
// deselect other buttons
|
// deselect other buttons
|
||||||
@ -418,8 +419,7 @@ public class TabLayoutActivity extends AbstractSDParentActivity{
|
|||||||
tabHost.setCurrentTabByTag("Text");
|
tabHost.setCurrentTabByTag("Text");
|
||||||
AppParams.crtTab = AppParams.Tabs.message;
|
AppParams.crtTab = AppParams.Tabs.message;
|
||||||
|
|
||||||
if(AppParams.DEMO && messageActivity.allVehicle.size()== 0)
|
if (AppParams.DEMO && messageActivity.allVehicle.size()== 0) {
|
||||||
{
|
|
||||||
messageActivity.UpdateVehs(getAllVehicle());
|
messageActivity.UpdateVehs(getAllVehicle());
|
||||||
messageActivity.UpdateSMS(listSMS);
|
messageActivity.UpdateSMS(listSMS);
|
||||||
}
|
}
|
||||||
@ -609,24 +609,21 @@ public class TabLayoutActivity extends AbstractSDParentActivity{
|
|||||||
});
|
});
|
||||||
|
|
||||||
// get About Button
|
// get About Button
|
||||||
buttonLogo = (ImageButton) findViewById(R.id.buttonLogo);
|
buttonLogo = findViewById(R.id.buttonLogo);
|
||||||
buttonLogo.setOnClickListener(new OnClickListener() {
|
buttonLogo.setOnClickListener(v -> {
|
||||||
@Override
|
// create dialog
|
||||||
public void onClick(View v) {
|
final Dialog dialog = new Dialog(context);
|
||||||
// create dialog
|
dialog.setTitle(AppParams.DEMO ? getString(R.string.app_name_demo) : getString(R.string.app_name));
|
||||||
final Dialog dialog = new Dialog(context);
|
dialog.setContentView(R.layout.dialog);
|
||||||
dialog.setTitle(AppParams.DEMO ? getString(R.string.app_name_demo) : getString(R.string.app_name));
|
ImageView image = dialog.findViewById(R.id.image);
|
||||||
dialog.setContentView(R.layout.dialog);
|
image.setImageResource(AppParams.DEMO ? R.drawable.icon_demo : R.drawable.ic_launcher);
|
||||||
ImageView image = (ImageView) dialog.findViewById(R.id.image);
|
TextView text = dialog.findViewById(R.id.text);
|
||||||
image.setImageResource(AppParams.DEMO ? R.drawable.icon_demo : R.drawable.ic_launcher);
|
TextView text2 = dialog.findViewById(R.id.text2);
|
||||||
TextView text = (TextView) dialog.findViewById(R.id.text);
|
text.setText(getString(R.string.version) + "1.0.8");
|
||||||
TextView text2 = (TextView) dialog.findViewById(R.id.text2);
|
text2.setText(getString(R.string.email) + ": support@safemobile.com");
|
||||||
text.setText(getString(R.string.version) + "1.0.8");
|
dialog.setCancelable(true);
|
||||||
text2.setText(getString(R.string.email) + ": support@safemobile.com");
|
dialog.setCanceledOnTouchOutside(true);
|
||||||
dialog.setCancelable(true);
|
dialog.show();
|
||||||
dialog.setCanceledOnTouchOutside(true);
|
|
||||||
dialog.show();
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
|
||||||
imageViewClose.setOnTouchListener(new OnTouchListener() {
|
imageViewClose.setOnTouchListener(new OnTouchListener() {
|
||||||
@ -1235,35 +1232,27 @@ public class TabLayoutActivity extends AbstractSDParentActivity{
|
|||||||
GPSmsg GPSPos= new GPSmsg(msg);
|
GPSmsg GPSPos= new GPSmsg(msg);
|
||||||
//SM.Debug("Got new GPS pos data:" + GPSPos.data);
|
//SM.Debug("Got new GPS pos data:" + GPSPos.data);
|
||||||
|
|
||||||
if(getSuperVehHash().get(GPSPos.gpsValue.imei) != null)
|
if (getSuperVehHash().get(GPSPos.gpsValue.imei) != null) {
|
||||||
{
|
getSuperVehHash().get(GPSPos.gpsValue.imei).SetNewPosition(GPSPos.gpsValue.lat, GPSPos.gpsValue.lng, GPSPos.gpsValue.timeGMT, GPSPos.gpsValue.speed);
|
||||||
((SuperVehicle) getSuperVehHash().get(GPSPos.gpsValue.imei)).SetNewPosition(GPSPos.gpsValue.lat, GPSPos.gpsValue.lng, GPSPos.gpsValue.timeGMT, GPSPos.gpsValue.speed);
|
|
||||||
|
|
||||||
if(getSuperVehHash().get(GPSPos.gpsValue.imei).needUpdate)
|
if (getSuperVehHash().get(GPSPos.gpsValue.imei).needUpdate) {
|
||||||
{
|
//list for live
|
||||||
|
if (AppParams.crtTab == AppParams.Tabs.live) {
|
||||||
//list for live
|
//SM.Debug("+++++ duda +++++");
|
||||||
if(AppParams.crtTab == AppParams.Tabs.live)
|
SM.Debug("currentActivity instanceof LiveActivity");
|
||||||
{
|
try {
|
||||||
//SM.Debug("+++++ duda +++++");
|
if(liveActivity != null)
|
||||||
SM.Debug("currentActivity instanceof LiveActivity");
|
liveActivity.refreshMap();
|
||||||
try
|
} catch (Exception ex) {
|
||||||
{
|
SM.Debug("Error load hash:"+ex.toString());
|
||||||
if(liveActivity != null)
|
}
|
||||||
liveActivity.refreshMap();
|
}
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
SM.Debug("Error load hash:"+ex.toString());
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onPollReceived(TCPEvent event)
|
public void onPollReceived(TCPEvent event) {
|
||||||
{
|
|
||||||
SM.Debug("Got POLL GPS message");
|
SM.Debug("Got POLL GPS message");
|
||||||
TCPmsg msg= event.msg();
|
TCPmsg msg= event.msg();
|
||||||
GPSmsg GPSPos= new GPSmsg(msg);
|
GPSmsg GPSPos= new GPSmsg(msg);
|
||||||
@ -1271,13 +1260,12 @@ public class TabLayoutActivity extends AbstractSDParentActivity{
|
|||||||
setMess("LAT:"+Double.toString(GPSPos.gpsValue.lat)+" LNG:"+Double.toString(GPSPos.gpsValue.lng));
|
setMess("LAT:"+Double.toString(GPSPos.gpsValue.lat)+" LNG:"+Double.toString(GPSPos.gpsValue.lng));
|
||||||
SM.Debug("Got new Poll pos data:" + GPSPos.data);
|
SM.Debug("Got new Poll pos data:" + GPSPos.data);
|
||||||
|
|
||||||
if(getSuperVehHash().get(GPSPos.gpsValue.imei) != null)
|
|
||||||
{
|
if(getSuperVehHash().get(GPSPos.gpsValue.imei) != null) {
|
||||||
((SuperVehicle) getSuperVehHash().get(GPSPos.gpsValue.imei)).SetNewPosition(GPSPos.gpsValue.lat, GPSPos.gpsValue.lng, GPSPos.gpsValue.timeGMT, GPSPos.gpsValue.speed);
|
((SuperVehicle) getSuperVehHash().get(GPSPos.gpsValue.imei)).SetNewPosition(GPSPos.gpsValue.lat, GPSPos.gpsValue.lng, GPSPos.gpsValue.timeGMT, GPSPos.gpsValue.speed);
|
||||||
//if is not check i need to force check to put on the map
|
//if is not check i need to force check to put on the map
|
||||||
Boolean forceChecked =false;
|
Boolean forceChecked =false;
|
||||||
if (!getSuperVehHash().get(GPSPos.gpsValue.imei).needUpdate)
|
if (!getSuperVehHash().get(GPSPos.gpsValue.imei).needUpdate) {
|
||||||
{
|
|
||||||
getSuperVehHash().get(GPSPos.gpsValue.imei).needUpdate =true;
|
getSuperVehHash().get(GPSPos.gpsValue.imei).needUpdate =true;
|
||||||
forceChecked =true;
|
forceChecked =true;
|
||||||
}
|
}
|
||||||
@ -1468,28 +1456,19 @@ public class TabLayoutActivity extends AbstractSDParentActivity{
|
|||||||
}
|
}
|
||||||
|
|
||||||
// if tab is not TextTab
|
// if tab is not TextTab
|
||||||
if(tabHost.getCurrentTab() != 2)
|
if(tabHost.getCurrentTab() != 2) {
|
||||||
{
|
|
||||||
myHandler.post(UpdateResults);
|
myHandler.post(UpdateResults);
|
||||||
//mHandler.dispatchMessage(new Message());
|
//mHandler.dispatchMessage(new Message());
|
||||||
}
|
} else
|
||||||
else
|
myHandler.post(() -> {
|
||||||
myHandler.post(new Runnable() {
|
// create Notification
|
||||||
|
createNotification(AppParams.messageNotif);
|
||||||
@Override
|
|
||||||
public void run() {
|
|
||||||
// create Notification
|
|
||||||
createNotification(AppParams.messageNotif);
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
//list for SMS
|
//list for SMS
|
||||||
if(AppParams.crtTab == AppParams.Tabs.message && messageActivity!= null)
|
if(AppParams.crtTab == AppParams.Tabs.message && messageActivity!= null) {
|
||||||
{
|
|
||||||
SM.Debug("currentActivity instanceof MessagesActivity - NewSMS | " + tempArr[0] + " | " + tempArr[1]);
|
SM.Debug("currentActivity instanceof MessagesActivity - NewSMS | " + tempArr[0] + " | " + tempArr[1]);
|
||||||
messageActivity.NewSMS(tempArr[0], tempArr[1], time);
|
messageActivity.NewSMS(tempArr[0], tempArr[1], time);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -1523,15 +1502,13 @@ public class TabLayoutActivity extends AbstractSDParentActivity{
|
|||||||
@Override
|
@Override
|
||||||
public void onLastPositionsReceived(TCPEvent event) {
|
public void onLastPositionsReceived(TCPEvent event) {
|
||||||
TCPmsg msg= event.msg();
|
TCPmsg msg= event.msg();
|
||||||
SM.Debug("Got lastpos");
|
SM.Debug("Got last pos");
|
||||||
//SM.Debug("Got lastpos :" + msg.allData);
|
|
||||||
|
|
||||||
LastPosmsg lastPos= new LastPosmsg(msg);
|
LastPosmsg lastPos= new LastPosmsg(msg);
|
||||||
//SM.Debug("Got LastPost msg.data:" + msg.data);
|
//SM.Debug("Got LastPost msg.data:" + msg.data);
|
||||||
for(LastPos posMsg: lastPos.PosList)
|
for(LastPos posMsg: lastPos.PosList) {
|
||||||
{
|
|
||||||
if(getSuperVehHash().get(posMsg.imei) != null)
|
if(getSuperVehHash().get(posMsg.imei) != null)
|
||||||
((SuperVehicle) getSuperVehHash().get(posMsg.imei)).SetDataFromLastPos(posMsg.lat, posMsg.lng, posMsg.timeGMT, posMsg.speed, posMsg.Address, posMsg.isON);
|
getSuperVehHash().get(posMsg.imei).SetDataFromLastPos(posMsg.lat, posMsg.lng, posMsg.timeGMT, posMsg.speed, posMsg.Address, posMsg.isON);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -5,337 +5,328 @@
|
|||||||
android:id="@+id/tab1Layout" android:orientation="horizontal"
|
android:id="@+id/tab1Layout" android:orientation="horizontal"
|
||||||
style="?bg">
|
style="?bg">
|
||||||
|
|
||||||
<RelativeLayout
|
<RelativeLayout
|
||||||
android:id="@+id/relativeHeader"
|
android:id="@+id/relativeHeader"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_alignParentTop="true">
|
android:layout_alignParentTop="true">
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:gravity="left"
|
android:gravity="left"
|
||||||
android:layout_weight="0"
|
android:layout_weight="0"
|
||||||
android:orientation="horizontal"
|
android:orientation="horizontal"
|
||||||
style="?header"
|
style="?header"
|
||||||
android:id="@+id/layoutHeader">
|
android:id="@+id/layoutHeader">
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/imageViewMsg"
|
android:id="@+id/imageViewMsg"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="fill_parent"
|
android:layout_height="fill_parent"
|
||||||
android:src="@drawable/calendar_48_red"
|
android:src="@drawable/calendar_48_red"
|
||||||
android:paddingLeft="0dp"
|
android:paddingLeft="0dp"
|
||||||
android:layout_margin="3dp"
|
android:layout_margin="3dp"
|
||||||
android:layout_weight="0" />
|
android:layout_weight="0" />
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/textView1"
|
android:id="@+id/textView1"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="fill_parent"
|
android:layout_height="fill_parent"
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:text="@string/history"
|
android:text="@string/history"
|
||||||
android:layout_marginLeft="5dp"
|
android:layout_marginLeft="5dp"
|
||||||
android:textStyle="bold"
|
android:textStyle="bold"
|
||||||
android:paddingTop="7dp"
|
android:paddingTop="7dp"
|
||||||
android:textColor="#FFFFFF"
|
android:textColor="#FFFFFF"
|
||||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
android:textAppearance="?android:attr/textAppearanceMedium"
|
||||||
android:layout_weight="0"/>
|
android:layout_weight="0"/>
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/imageViewSeparator"
|
android:id="@+id/imageViewSeparator"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="fill_parent"
|
android:layout_height="fill_parent"
|
||||||
android:layout_gravity="center_vertical"
|
android:layout_gravity="center_vertical"
|
||||||
android:src="@drawable/separator_white"
|
android:src="@drawable/separator_white"
|
||||||
android:layout_margin="2dp"
|
android:layout_margin="2dp"
|
||||||
android:layout_weight="0"
|
android:layout_weight="0"
|
||||||
android:visibility="invisible"
|
android:visibility="invisible"
|
||||||
android:focusable="false" />
|
android:focusable="false" />
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/imageViewDown"
|
android:id="@+id/imageViewDown"
|
||||||
android:layout_width="20dp"
|
android:layout_width="20dp"
|
||||||
android:layout_height="fill_parent"
|
android:layout_height="fill_parent"
|
||||||
android:layout_gravity="center_vertical"
|
android:layout_gravity="center_vertical"
|
||||||
android:layout_marginBottom="2dp"
|
android:layout_marginBottom="2dp"
|
||||||
android:layout_marginTop="2dp"
|
android:layout_marginTop="2dp"
|
||||||
android:focusable="false"
|
android:focusable="false"
|
||||||
android:visibility="invisible"
|
android:visibility="invisible"
|
||||||
android:src="@drawable/arrow_menu_down" />
|
android:src="@drawable/arrow_menu_down" />
|
||||||
|
|
||||||
<ImageButton
|
<ImageButton
|
||||||
android:id="@+id/imageButtonAdd2"
|
android:id="@+id/imageButtonAdd2"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:scaleType="centerInside"
|
android:scaleType="centerInside"
|
||||||
android:layout_marginRight="5dp"
|
android:layout_marginRight="5dp"
|
||||||
android:paddingLeft="2dp"
|
android:paddingLeft="2dp"
|
||||||
android:visibility="invisible"
|
android:visibility="invisible"
|
||||||
android:background="@drawable/addmessage_selector"/>
|
android:background="@drawable/addmessage_selector"/>
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/changeTraffic"
|
android:id="@+id/changeTraffic"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="fill_parent"
|
android:layout_height="fill_parent"
|
||||||
android:padding="3dp"
|
android:padding="3dp"
|
||||||
android:layout_weight="0"
|
android:layout_weight="0"
|
||||||
android:src="@drawable/traffic_off"
|
android:src="@drawable/traffic_off"
|
||||||
android:adjustViewBounds="true"/>
|
android:adjustViewBounds="true"/>
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/changeMapTypeHeader"
|
android:id="@+id/changeMapTypeHeader"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="fill_parent"
|
android:layout_height="fill_parent"
|
||||||
android:padding="3dp"
|
android:padding="3dp"
|
||||||
android:layout_weight="0"
|
android:layout_weight="0"
|
||||||
android:src="@drawable/satellite"
|
android:src="@drawable/satellite"
|
||||||
android:adjustViewBounds="true"/>
|
android:adjustViewBounds="true"/>
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/textViewNew"
|
android:id="@+id/textViewNew"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="fill_parent"
|
android:layout_height="fill_parent"
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:text="New"
|
android:text="New"
|
||||||
android:textStyle="bold"
|
android:textStyle="bold"
|
||||||
android:paddingTop="7dp"
|
android:paddingTop="7dp"
|
||||||
android:textColor="#FFFFFF"
|
android:textColor="#FFFFFF"
|
||||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
android:textAppearance="?android:attr/textAppearanceMedium"
|
||||||
android:layout_weight="0"
|
android:layout_weight="0"
|
||||||
android:paddingRight="5dp"
|
android:paddingRight="5dp"
|
||||||
android:visibility="gone"/>
|
android:visibility="gone"/>
|
||||||
<!-- android:background="@drawable/addmessage_selector" -->
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
</RelativeLayout>
|
<RelativeLayout
|
||||||
|
android:layout_width="fill_parent"
|
||||||
|
android:layout_height="fill_parent"
|
||||||
|
android:layout_below="@+id/relativeHeader">
|
||||||
|
|
||||||
<RelativeLayout
|
<LinearLayout
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="fill_parent"
|
android:layout_height="fill_parent"
|
||||||
android:layout_below="@+id/relativeHeader">
|
android:weightSum="1">
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="200dp"
|
||||||
android:layout_height="fill_parent"
|
android:layout_height="fill_parent"
|
||||||
android:weightSum="1">
|
android:id="@+id/layoutBig"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:visibility="visible">
|
||||||
|
<LinearLayout
|
||||||
<LinearLayout
|
android:layout_width="fill_parent"
|
||||||
android:layout_width="200dp"
|
android:layout_height="fill_parent"
|
||||||
android:layout_height="fill_parent"
|
android:id="@+id/liveVehicle"
|
||||||
android:id="@+id/layoutBig"
|
android:background="#ffffff"
|
||||||
android:orientation="vertical"
|
android:orientation="vertical">
|
||||||
android:visibility="visible">
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="fill_parent"
|
|
||||||
android:layout_height="fill_parent"
|
|
||||||
android:id="@+id/liveVehicle"
|
|
||||||
android:background="#ffffff"
|
|
||||||
android:orientation="vertical">
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:id="@+id/LayoutSpinner"
|
android:id="@+id/LayoutSpinner"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="fill_parent"
|
android:layout_height="fill_parent"
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:paddingTop="10dp"
|
android:paddingTop="10dp"
|
||||||
android:gravity="top"
|
android:gravity="top"
|
||||||
android:layout_weight="1">
|
android:layout_weight="1">
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/vehicle"
|
android:text="@string/vehicle"
|
||||||
android:textSize="20dp"
|
android:textSize="20dp"
|
||||||
|
android:paddingLeft="5dp"
|
||||||
|
android:textColor="#000000"
|
||||||
|
android:gravity="left"
|
||||||
|
android:id="@+id/labelVehicle"/>
|
||||||
|
|
||||||
|
<Spinner
|
||||||
|
android:id="@+id/spinnerVehicle"
|
||||||
|
android:layout_width="fill_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:entries="@array/arrayLanguages"
|
||||||
|
android:gravity="center_horizontal"
|
||||||
|
android:prompt="@string/selUsername"/>
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_gravity="center_vertical"
|
||||||
|
android:text="@string/startDate"
|
||||||
|
android:textSize="22dp"
|
||||||
|
android:paddingLeft="5dp"
|
||||||
|
android:textColor="#000000"
|
||||||
|
android:gravity="left"
|
||||||
|
android:id="@+id/labelStartDate"
|
||||||
|
android:visibility="gone"/>
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/layoutStartPicker"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_width="fill_parent"
|
||||||
|
android:layout_gravity="left"
|
||||||
|
android:gravity="right"
|
||||||
|
android:layout_marginLeft="2sp"
|
||||||
|
android:layout_marginRight="3sp"
|
||||||
|
android:orientation="horizontal"
|
||||||
|
android:background="@drawable/style_spinner">
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/imageViewStartDate"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="fill_parent"
|
||||||
|
android:layout_gravity="center_vertical"
|
||||||
|
android:src="@drawable/calendar_48" />
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/textViewStartDate"
|
||||||
|
android:layout_width="fill_parent"
|
||||||
|
android:layout_height="fill_parent"
|
||||||
|
android:gravity="center"
|
||||||
|
android:text="10:41, 12.12.2011"
|
||||||
|
android:textSize="18sp"
|
||||||
|
android:paddingLeft="1dp"
|
||||||
|
android:textColor="#000000"/>
|
||||||
|
</LinearLayout>
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_gravity="center_vertical"
|
||||||
|
android:text="@string/endDate"
|
||||||
|
android:textSize="22dp"
|
||||||
|
android:paddingLeft="5dp"
|
||||||
|
android:textColor="#000000"
|
||||||
|
android:gravity="left"
|
||||||
|
android:id="@+id/labelEndDate"
|
||||||
|
android:visibility="gone"/>
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/layoutEndPicker"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_width="fill_parent"
|
||||||
|
android:layout_gravity="left"
|
||||||
|
android:gravity="right"
|
||||||
|
android:layout_marginTop="3sp"
|
||||||
|
android:layout_marginLeft="2sp"
|
||||||
|
android:layout_marginRight="3sp"
|
||||||
|
android:orientation="horizontal"
|
||||||
|
android:background="@drawable/style_spinner">
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/imageViewEndDate"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="fill_parent"
|
||||||
|
android:gravity="center_vertical"
|
||||||
|
android:src="@drawable/calendar_48_red" />
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/textViewEndDate"
|
||||||
|
android:layout_width="fill_parent"
|
||||||
|
android:layout_height="fill_parent"
|
||||||
|
android:gravity="center"
|
||||||
|
android:text="10:00, 13.12.2011"
|
||||||
|
android:textSize="18sp"
|
||||||
|
android:paddingLeft="1dp"
|
||||||
|
android:textColor="#000000" />
|
||||||
|
</LinearLayout>
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="fill_parent"
|
||||||
|
android:layout_height="fill_parent"
|
||||||
|
android:gravity="bottom">
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/textViewSearch"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:gravity="bottom"
|
||||||
|
android:text=""
|
||||||
|
android:textSize="16dp"
|
||||||
android:paddingLeft="5dp"
|
android:paddingLeft="5dp"
|
||||||
android:textColor="#000000"
|
android:textColor="#000000"/>
|
||||||
android:gravity="left"
|
</LinearLayout>
|
||||||
android:id="@+id/labelVehicle"/>
|
</LinearLayout>
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_width="fill_parent"
|
||||||
|
android:layout_weight="0"
|
||||||
|
style="?header"
|
||||||
|
android:gravity="center"
|
||||||
|
android:paddingTop="4dp">
|
||||||
|
|
||||||
<Spinner
|
<Button
|
||||||
android:id="@+id/spinnerVehicle"
|
android:id="@+id/buttonDisplay"
|
||||||
android:layout_width="fill_parent"
|
style="?login"
|
||||||
android:layout_height="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:entries="@array/arrayLanguages"
|
android:layout_height="wrap_content"
|
||||||
android:gravity="center_horizontal"
|
android:layout_gravity="center_horizontal"
|
||||||
android:prompt="@string/selUsername"/>
|
android:layout_weight="0"
|
||||||
<TextView
|
android:text="@string/display" />
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_gravity="center_vertical"
|
|
||||||
android:text="@string/startDate"
|
|
||||||
android:textSize="22dp"
|
|
||||||
android:paddingLeft="5dp"
|
|
||||||
android:textColor="#000000"
|
|
||||||
android:gravity="left"
|
|
||||||
android:id="@+id/labelStartDate"
|
|
||||||
android:visibility="gone"/>
|
|
||||||
<LinearLayout
|
|
||||||
android:id="@+id/layoutStartPicker"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_width="fill_parent"
|
|
||||||
android:layout_gravity="left"
|
|
||||||
android:gravity="right"
|
|
||||||
android:layout_marginLeft="2sp"
|
|
||||||
android:layout_marginRight="3sp"
|
|
||||||
android:orientation="horizontal"
|
|
||||||
android:background="@drawable/style_spinner">
|
|
||||||
<ImageView
|
|
||||||
android:id="@+id/imageViewStartDate"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="fill_parent"
|
|
||||||
android:layout_gravity="center_vertical"
|
|
||||||
android:src="@drawable/calendar_48" />
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/textViewStartDate"
|
|
||||||
android:layout_width="fill_parent"
|
|
||||||
android:layout_height="fill_parent"
|
|
||||||
android:gravity="center"
|
|
||||||
android:text="10:41, 12.12.2011"
|
|
||||||
android:textSize="18sp"
|
|
||||||
android:paddingLeft="1dp"
|
|
||||||
android:textColor="#000000"/>
|
|
||||||
</LinearLayout>
|
|
||||||
<TextView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_gravity="center_vertical"
|
|
||||||
android:text="@string/endDate"
|
|
||||||
android:textSize="22dp"
|
|
||||||
android:paddingLeft="5dp"
|
|
||||||
android:textColor="#000000"
|
|
||||||
android:gravity="left"
|
|
||||||
android:id="@+id/labelEndDate"
|
|
||||||
android:visibility="gone"/>
|
|
||||||
<LinearLayout
|
|
||||||
android:id="@+id/layoutEndPicker"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_width="fill_parent"
|
|
||||||
android:layout_gravity="left"
|
|
||||||
android:gravity="right"
|
|
||||||
android:layout_marginTop="3sp"
|
|
||||||
android:layout_marginLeft="2sp"
|
|
||||||
android:layout_marginRight="3sp"
|
|
||||||
android:orientation="horizontal"
|
|
||||||
android:background="@drawable/style_spinner">
|
|
||||||
<ImageView
|
|
||||||
android:id="@+id/imageViewEndDate"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="fill_parent"
|
|
||||||
android:gravity="center_vertical"
|
|
||||||
android:src="@drawable/calendar_48_red" />
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/textViewEndDate"
|
|
||||||
android:layout_width="fill_parent"
|
|
||||||
android:layout_height="fill_parent"
|
|
||||||
android:gravity="center"
|
|
||||||
android:text="10:00, 13.12.2011"
|
|
||||||
android:textSize="18sp"
|
|
||||||
android:paddingLeft="1dp"
|
|
||||||
android:textColor="#000000" />
|
|
||||||
</LinearLayout>
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="fill_parent"
|
|
||||||
android:layout_height="fill_parent"
|
|
||||||
android:gravity="bottom">
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/textViewSearch"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:gravity="bottom"
|
|
||||||
android:text=""
|
|
||||||
android:textSize="16dp"
|
|
||||||
android:paddingLeft="5dp"
|
|
||||||
android:textColor="#000000"/>
|
|
||||||
</LinearLayout>
|
|
||||||
</LinearLayout>
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_width="fill_parent"
|
|
||||||
android:layout_weight="0"
|
|
||||||
style="?header"
|
|
||||||
android:gravity="center"
|
|
||||||
android:paddingTop="4dp">
|
|
||||||
|
|
||||||
<Button
|
</LinearLayout>
|
||||||
android:id="@+id/buttonDisplay"
|
</LinearLayout>
|
||||||
style="?login"
|
</LinearLayout>
|
||||||
android:layout_width="wrap_content"
|
<LinearLayout
|
||||||
android:layout_height="wrap_content"
|
android:layout_width="20dp"
|
||||||
android:layout_gravity="center_horizontal"
|
android:layout_height="fill_parent"
|
||||||
android:layout_weight="0"
|
android:id="@+id/slidelayout"
|
||||||
android:text="@string/display" />
|
android:layout_toRightOf="@id/liveVehicle"
|
||||||
|
android:gravity="center_vertical"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:layout_weight="0">
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/slideLayoutImage"
|
||||||
|
android:layout_width="fill_parent"
|
||||||
|
android:layout_height="fill_parent"
|
||||||
|
android:gravity="center_horizontal"
|
||||||
|
android:src="@drawable/arrow_left"
|
||||||
|
android:layout_weight="1"
|
||||||
|
style="?sliders" />
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<fragment
|
||||||
|
android:layout_width="fill_parent"
|
||||||
|
android:layout_height="fill_parent"
|
||||||
|
android:id="@+id/map"
|
||||||
|
android:layout_toRightOf="@id/slidelayout"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:name="com.google.android.gms.maps.SupportMapFragment" />
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
<LinearLayout
|
<ImageView
|
||||||
android:layout_width="20dp"
|
android:id="@+id/changeMapType"
|
||||||
android:layout_height="fill_parent"
|
android:layout_width="wrap_content"
|
||||||
android:id="@+id/slidelayout"
|
android:layout_height="wrap_content"
|
||||||
android:layout_toRightOf="@id/liveVehicle"
|
android:layout_alignParentRight="true"
|
||||||
android:gravity="center_vertical"
|
android:layout_alignParentTop="true"
|
||||||
android:orientation="vertical"
|
android:padding="3dp"
|
||||||
android:layout_weight="0">
|
android:src="@drawable/satellite"
|
||||||
<ImageView
|
android:visibility="gone"/>
|
||||||
android:id="@+id/slideLayoutImage"
|
<LinearLayout
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="fill_parent"
|
android:layout_height="30dp"
|
||||||
android:gravity="center_horizontal"
|
android:layout_margin="3dp"
|
||||||
android:src="@drawable/arrow_left"
|
android:layout_alignLeft="@+id/changeMapType"
|
||||||
android:layout_weight="1"
|
android:layout_below="@+id/changeMapType"
|
||||||
style="?sliders" />
|
android:background="#fff"
|
||||||
</LinearLayout>
|
android:orientation="horizontal"
|
||||||
|
android:id="@+id/layoutTraffic"
|
||||||
<LinearLayout
|
android:visibility="gone">
|
||||||
android:id="@+id/layoutGoogleMaps"
|
<ImageView
|
||||||
android:layout_width="fill_parent"
|
android:id="@+id/checkTraffic"
|
||||||
android:layout_height="fill_parent"
|
android:layout_width="wrap_content"
|
||||||
android:layout_toRightOf="@id/slidelayout"
|
android:layout_height="fill_parent"
|
||||||
android:layout_weight="1"
|
android:padding="1dp"
|
||||||
android:orientation="horizontal" >
|
android:src="@drawable/checked"/>
|
||||||
</LinearLayout>
|
<TextView
|
||||||
|
android:id="@+id/changeTraffic2"
|
||||||
</LinearLayout>
|
android:text="Traffic"
|
||||||
<ImageView
|
android:textSize="16dp"
|
||||||
android:id="@+id/changeMapType"
|
android:textColor="#000"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="fill_parent"
|
||||||
android:layout_alignParentRight="true"
|
android:gravity="center_vertical"/>
|
||||||
android:layout_alignParentTop="true"
|
|
||||||
android:padding="3dp"
|
|
||||||
android:src="@drawable/satellite"
|
|
||||||
android:visibility="gone"/>
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="fill_parent"
|
|
||||||
android:layout_height="30dp"
|
|
||||||
android:layout_margin="3dp"
|
|
||||||
android:layout_alignLeft="@+id/changeMapType"
|
|
||||||
android:layout_below="@+id/changeMapType"
|
|
||||||
android:background="#fff"
|
|
||||||
android:orientation="horizontal"
|
|
||||||
android:id="@+id/layoutTraffic"
|
|
||||||
android:visibility="gone">
|
|
||||||
<ImageView
|
|
||||||
android:id="@+id/checkTraffic"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="fill_parent"
|
|
||||||
android:padding="1dp"
|
|
||||||
android:src="@drawable/checked"/>
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/changeTraffic2"
|
|
||||||
android:text="Traffic"
|
|
||||||
android:textSize="16dp"
|
|
||||||
android:textColor="#000"
|
|
||||||
android:layout_width="fill_parent"
|
|
||||||
android:layout_height="fill_parent"
|
|
||||||
android:gravity="center_vertical"/>
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
|
|
||||||
</RelativeLayout>
|
|
||||||
|
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
</RelativeLayout>
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
@ -5,88 +5,68 @@
|
|||||||
android:orientation="vertical" >
|
android:orientation="vertical" >
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:id="@+id/linearLayout1"
|
android:id="@+id/linearLayout1"
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="fill_parent"
|
android:layout_height="fill_parent"
|
||||||
android:background="#000000">
|
android:background="#000000">
|
||||||
<LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:id="@+id/linearLayout2" android:orientation="vertical">
|
|
||||||
<!--
|
|
||||||
<LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:id="@+id/linearLayout3">
|
|
||||||
|
|
||||||
<LinearLayout android:layout_width="80dp" android:id="@+id/linearLayout4" android:layout_height="wrap_content">
|
<LinearLayout
|
||||||
<Button android:layout_width="wrap_content" android:text="Create tabs" android:layout_height="wrap_content" android:id="@+id/button1"></Button>
|
android:layout_width="fill_parent"
|
||||||
</LinearLayout>
|
android:id="@+id/linearLayout6"
|
||||||
<LinearLayout android:layout_height="match_parent" android:id="@+id/linearLayout5" android:layout_width="match_parent">
|
android:orientation="horizontal"
|
||||||
<LinearLayout android:layout_width="100dp" android:layout_height="match_parent" android:id="@+id/linearLayout7" android:layout_weight="0.29" android:weightSum="1">
|
android:layout_height="fill_parent">
|
||||||
<Button android:text="Remove selected tab" android:layout_height="wrap_content" android:id="@+id/button3" android:layout_width="wrap_content"></Button>
|
<TabHost
|
||||||
</LinearLayout>
|
android:layout_width="fill_parent"
|
||||||
<EditText android:layout_width="wrap_content" android:id="@+id/editText1" android:layout_height="wrap_content" android:inputType="number" android:layout_weight="13.86">
|
android:layout_height="fill_parent"
|
||||||
<requestFocus></requestFocus>
|
android:id="@android:id/tabhost"
|
||||||
</EditText>
|
android:layout_weight="1">
|
||||||
<LinearLayout android:layout_width="80dp" android:layout_height="match_parent" android:id="@+id/linearLayout7" android:layout_weight="0.29" android:weightSum="1">
|
<RelativeLayout
|
||||||
<Button android:layout_width="wrap_content" android:text="Add tab" android:layout_height="wrap_content" android:id="@+id/button2" android:layout_weight="0.25"></Button>
|
android:orientation="vertical"
|
||||||
</LinearLayout>
|
|
||||||
</LinearLayout>
|
|
||||||
</LinearLayout>
|
|
||||||
-->
|
|
||||||
</LinearLayout>
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:id="@+id/linearLayout6"
|
android:layout_height="fill_parent"
|
||||||
android:orientation="horizontal"
|
android:padding="0dp">
|
||||||
android:layout_height="fill_parent">
|
<TabWidget
|
||||||
<TabHost
|
android:id="@android:id/tabs"
|
||||||
|
android:layout_width="390dp"
|
||||||
|
android:layout_height="wrap_content"/>
|
||||||
|
|
||||||
|
<FrameLayout
|
||||||
|
android:id="@android:id/tabcontent"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="fill_parent"
|
android:layout_height="fill_parent"
|
||||||
android:id="@android:id/tabhost"
|
android:layout_below="@android:id/tabs"/>
|
||||||
android:layout_weight="1">
|
|
||||||
<RelativeLayout
|
|
||||||
android:orientation="vertical"
|
|
||||||
android:layout_width="fill_parent"
|
|
||||||
android:layout_height="fill_parent"
|
|
||||||
android:padding="0dp">
|
|
||||||
<TabWidget
|
|
||||||
android:id="@android:id/tabs"
|
|
||||||
android:layout_width="390dp"
|
|
||||||
android:layout_height="wrap_content"/>
|
|
||||||
|
|
||||||
<FrameLayout
|
</RelativeLayout>
|
||||||
android:id="@android:id/tabcontent"
|
</TabHost>
|
||||||
android:layout_width="fill_parent"
|
<LinearLayout
|
||||||
android:layout_height="fill_parent"
|
android:layout_width="wrap_content"
|
||||||
android:layout_below="@android:id/tabs"/>
|
android:layout_height="fill_parent"
|
||||||
|
android:layout_weight="0"
|
||||||
</RelativeLayout>
|
android:orientation="horizontal">
|
||||||
</TabHost>
|
<LinearLayout
|
||||||
<LinearLayout
|
android:layout_width="20dp"
|
||||||
android:layout_width="wrap_content"
|
android:layout_height="fill_parent"
|
||||||
android:layout_height="fill_parent"
|
android:id="@+id/layoutSlideMenu"
|
||||||
android:layout_weight="0"
|
android:gravity="center_vertical"
|
||||||
android:orientation="horizontal">
|
android:orientation="vertical"
|
||||||
<LinearLayout
|
android:layout_weight="0">
|
||||||
android:layout_width="20dp"
|
<ImageView
|
||||||
android:layout_height="fill_parent"
|
android:id="@+id/imageViewSlideMenu"
|
||||||
android:id="@+id/layoutSlideMenu"
|
android:layout_width="fill_parent"
|
||||||
android:gravity="center_vertical"
|
android:layout_height="fill_parent"
|
||||||
android:orientation="vertical"
|
android:gravity="center_horizontal"
|
||||||
android:layout_weight="0">
|
android:src="@drawable/arrow_right"
|
||||||
<ImageView
|
android:layout_weight="1"
|
||||||
android:id="@+id/imageViewSlideMenu"
|
style="?sliders" />
|
||||||
android:layout_width="fill_parent"
|
</LinearLayout>
|
||||||
android:layout_height="fill_parent"
|
<include
|
||||||
android:gravity="center_horizontal"
|
android:id="@+id/layoutMenu"
|
||||||
android:src="@drawable/arrow_right"
|
android:layout_width="fill_parent"
|
||||||
android:layout_weight="1"
|
android:layout_height="fill_parent"
|
||||||
style="?sliders" />
|
layout="@layout/menu" />
|
||||||
</LinearLayout>
|
|
||||||
<include
|
|
||||||
android:id="@+id/layoutMenu"
|
|
||||||
android:layout_width="fill_parent"
|
|
||||||
android:layout_height="fill_parent"
|
|
||||||
layout="@layout/menu" />
|
|
||||||
</LinearLayout>
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
</LinearLayout>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<RelativeLayout
|
<RelativeLayout
|
||||||
@ -100,15 +80,15 @@
|
|||||||
android:layout_margin="2dp"
|
android:layout_margin="2dp"
|
||||||
android:visibility="invisible"
|
android:visibility="invisible"
|
||||||
android:background="@drawable/alert_message">
|
android:background="@drawable/alert_message">
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/imageViewClose"
|
android:id="@+id/imageViewClose"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:src="@drawable/balloon_overlay_close"
|
android:src="@drawable/balloon_overlay_close"
|
||||||
android:layout_alignParentRight="true"
|
android:layout_alignParentRight="true"
|
||||||
android:layout_alignParentTop="true"
|
android:layout_alignParentTop="true"
|
||||||
android:visibility="invisible"
|
android:visibility="invisible"
|
||||||
android:background="@drawable/balloon_close_bg_selector" />
|
android:background="@drawable/balloon_close_bg_selector" />
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
@ -127,15 +107,15 @@
|
|||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:layout_above="@android:id/tabs"/>
|
android:layout_above="@android:id/tabs"/>
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:orientation="horizontal">
|
android:orientation="horizontal">
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/imageViewPopUp"
|
android:id="@+id/imageViewPopUp"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:src="@drawable/message"
|
android:src="@drawable/message"
|
||||||
android:layout_gravity="center_vertical" />
|
android:layout_gravity="center_vertical" />
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
@ -162,7 +142,6 @@
|
|||||||
android:layout_gravity="center_vertical"/>
|
android:layout_gravity="center_vertical"/>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
@ -232,4 +232,7 @@
|
|||||||
<item >German</item>
|
<item >German</item>
|
||||||
<item >Romanian</item>
|
<item >Romanian</item>
|
||||||
</string-array>
|
</string-array>
|
||||||
|
|
||||||
|
<string name="speedMph">%1$d mph</string>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
@ -236,4 +236,7 @@
|
|||||||
<item >Spanish</item>
|
<item >Spanish</item>
|
||||||
<item >Russian</item>
|
<item >Russian</item>
|
||||||
</string-array>
|
</string-array>
|
||||||
|
|
||||||
|
<string name="speedMph">%1$d mph</string>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
@ -233,4 +233,7 @@
|
|||||||
<item >Turca</item>
|
<item >Turca</item>
|
||||||
<item >Romana</item>
|
<item >Romana</item>
|
||||||
</string-array>
|
</string-array>
|
||||||
|
|
||||||
|
<string name="speedMph">%1$d mph</string>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
@ -232,4 +232,7 @@
|
|||||||
<item >German</item>
|
<item >German</item>
|
||||||
<item >Romanian</item>
|
<item >Romanian</item>
|
||||||
</string-array>
|
</string-array>
|
||||||
|
|
||||||
|
<string name="speedMph">%1$d mph</string>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
@ -254,4 +254,8 @@
|
|||||||
</string-array>
|
</string-array>
|
||||||
<string name="title_activity_new_live">NewLiveActivity</string>
|
<string name="title_activity_new_live">NewLiveActivity</string>
|
||||||
<string name="title_activity_google_maps">GoogleMapsActivity</string>
|
<string name="title_activity_google_maps">GoogleMapsActivity</string>
|
||||||
|
|
||||||
|
|
||||||
|
<string name="speedMph">%1$d mph</string>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
Loading…
Reference in New Issue
Block a user