Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
0b890b74e0 | |||
73d2cedfba |
@ -255,12 +255,13 @@ public abstract class AbstractSDParentActivity extends TabActivity {
|
||||
return res;
|
||||
}
|
||||
|
||||
public boolean getAlarms(long userID) {
|
||||
if (tcp == null)
|
||||
public boolean getAlarms(long userID)
|
||||
{
|
||||
if(tcp == null)
|
||||
return false;
|
||||
|
||||
boolean res = tcp.Write("0.0", "#27#" + userID + "#");
|
||||
if (res)
|
||||
if(res)
|
||||
SM.Debug("Message [GetAlarms] sent to app server");
|
||||
else
|
||||
SM.Debug("Could not send message [GetAlarms]!!");
|
||||
|
@ -42,6 +42,7 @@ public class GoogleMapsInfoBubble implements GoogleMap.InfoWindowAdapter {
|
||||
public GoogleMapsInfoBubble(LayoutInflater layoutInflater, Context context) {
|
||||
isLiveTab = false;
|
||||
this.context = context;
|
||||
// this.superVehHash = vehicles;
|
||||
mWindow = layoutInflater.inflate(R.layout.map_marker_info_bubble, null);
|
||||
}
|
||||
|
||||
@ -72,7 +73,7 @@ public class GoogleMapsInfoBubble implements GoogleMap.InfoWindowAdapter {
|
||||
}
|
||||
} else {
|
||||
try {
|
||||
position = Integer.parseInt(marker.getTitle());
|
||||
position = Integer.getInteger(marker.getTitle());
|
||||
} catch (Exception e) {
|
||||
Log.v(TAG, "Unable to parse Google Maps Info Bubble title on History");
|
||||
}
|
||||
|
@ -10,13 +10,19 @@ import android.content.ServiceConnection;
|
||||
import android.content.SharedPreferences;
|
||||
import android.content.res.Configuration;
|
||||
import android.graphics.Color;
|
||||
import android.net.ConnectivityManager;
|
||||
import android.net.Network;
|
||||
import android.net.NetworkCapabilities;
|
||||
import android.net.NetworkRequest;
|
||||
import android.os.AsyncTask;
|
||||
import android.os.Build;
|
||||
import android.os.Bundle;
|
||||
import android.os.Handler;
|
||||
import android.os.IBinder;
|
||||
import android.os.Looper;
|
||||
import android.text.Editable;
|
||||
import android.text.InputType;
|
||||
import android.util.Log;
|
||||
import android.view.Gravity;
|
||||
import android.view.View;
|
||||
import android.view.View.OnClickListener;
|
||||
@ -114,6 +120,17 @@ public class SDMobileActivity extends Activity {
|
||||
super.onCreate(savedInstanceState);
|
||||
SM.Debug("##### onCREATE ##### with LANGUAGE " + AppParams.LANGUAGETMP);
|
||||
|
||||
ConnectivityManager connectivityManager =
|
||||
(ConnectivityManager) this.getSystemService(Context.CONNECTIVITY_SERVICE);
|
||||
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
|
||||
connectivityManager.registerDefaultNetworkCallback(networkCallback);
|
||||
} else {
|
||||
NetworkRequest request = new NetworkRequest.Builder()
|
||||
.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET).build();
|
||||
connectivityManager.registerNetworkCallback(request, networkCallback);
|
||||
}
|
||||
|
||||
AppParams.theme = AppParams.Theme.SAFEDISPATCH;
|
||||
if (AppParams.theme == AppParams.Theme.SAFENET)
|
||||
this.setTheme(R.style.Theme_Safenet);
|
||||
@ -524,6 +541,22 @@ public class SDMobileActivity extends Activity {
|
||||
SM.Debug("##### onRESUME #####");
|
||||
}
|
||||
|
||||
private final ConnectivityManager.NetworkCallback networkCallback = new ConnectivityManager.NetworkCallback() {
|
||||
@Override
|
||||
public void onAvailable(Network network) {
|
||||
// network available
|
||||
Log.v("NetworkAvailability", "available");
|
||||
if (tcp != null && !tcp.isConnectionUP)
|
||||
saveIPandRestartTCP(AppParams.IP, AppParams.PORT);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onLost(Network network) {
|
||||
// network unavailable
|
||||
Log.v("NetworkAvailability", "unavailable");
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
private void startTabActivity(long userID) {
|
||||
// good login - load activity
|
||||
|
@ -1741,8 +1741,10 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
|
||||
}
|
||||
|
||||
//list for SMS
|
||||
if (AppParams.crtTab == AppParams.Tabs.alarms)
|
||||
if (AppParams.crtTab == AppParams.Tabs.alarms) {
|
||||
SM.Debug("currentActivity instanceof AlarmActivity - newSMS | " + tempArr[0] + " | " + tempArr[1]);
|
||||
getAlarms(AppParams.USERID);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
Reference in New Issue
Block a user