|
@@ -325,13 +325,15 @@ public class ShipMap extends RelativeLayout implements GoogleMap.OnMarkerClickLi
|
|
|
|
|
|
|
|
if (current != null && showCurrent()) {
|
|
if (current != null && showCurrent()) {
|
|
|
moveToLocation(current);
|
|
moveToLocation(current);
|
|
|
-
|
|
|
|
|
|
|
+ if (mTwinkleCurrent) {
|
|
|
|
|
+ startTwinkle();
|
|
|
|
|
+ }
|
|
|
} else if (pol != null && showPol()) {
|
|
} else if (pol != null && showPol()) {
|
|
|
moveToLocation(pol);
|
|
moveToLocation(pol);
|
|
|
} else if (pod != null && showPod()) {
|
|
} else if (pod != null && showPod()) {
|
|
|
moveToLocation(pod);
|
|
moveToLocation(pod);
|
|
|
}
|
|
}
|
|
|
- startTwinkle();
|
|
|
|
|
|
|
+
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -370,8 +372,6 @@ public class ShipMap extends RelativeLayout implements GoogleMap.OnMarkerClickLi
|
|
|
|
|
|
|
|
private void twinkleCurrentAlpha(double alpha) {
|
|
private void twinkleCurrentAlpha(double alpha) {
|
|
|
|
|
|
|
|
- Log.d("Twinkle", "twinkleCurrentAlpha: " + alpha);
|
|
|
|
|
-
|
|
|
|
|
if (mUseGoogleMap) {
|
|
if (mUseGoogleMap) {
|
|
|
if (mCurrentGoogleMarker != null) {
|
|
if (mCurrentGoogleMarker != null) {
|
|
|
mCurrentGoogleMarker.setAlpha((float) alpha);
|
|
mCurrentGoogleMarker.setAlpha((float) alpha);
|
|
@@ -460,7 +460,7 @@ public class ShipMap extends RelativeLayout implements GoogleMap.OnMarkerClickLi
|
|
|
|
|
|
|
|
com.google.android.gms.maps.model.Marker marker = mGoogleMap.addMarker(options);
|
|
com.google.android.gms.maps.model.Marker marker = mGoogleMap.addMarker(options);
|
|
|
|
|
|
|
|
- if (port.equals("Port Of Discharge")) {
|
|
|
|
|
|
|
+ if (port.equals("Current")) {
|
|
|
mCurrentGoogleMarker = marker;
|
|
mCurrentGoogleMarker = marker;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -498,7 +498,7 @@ public class ShipMap extends RelativeLayout implements GoogleMap.OnMarkerClickLi
|
|
|
|
|
|
|
|
Marker marker = (Marker) mBaiduMap.getMap().addOverlay(markeroption);
|
|
Marker marker = (Marker) mBaiduMap.getMap().addOverlay(markeroption);
|
|
|
|
|
|
|
|
- if (port.equals("Port Of Discharge")) {
|
|
|
|
|
|
|
+ if (port.equals("Current")) {
|
|
|
mCurrentBaiduMarker = marker;
|
|
mCurrentBaiduMarker = marker;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -508,7 +508,7 @@ public class ShipMap extends RelativeLayout implements GoogleMap.OnMarkerClickLi
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- private boolean mShowPol = true,mShowPoe,mShowPod = true,mShowPor,mShowOrigin,mShowDestination,mShowCurrent = true;
|
|
|
|
|
|
|
+ private boolean mShowPol = true,mShowPoe,mShowPod = true,mShowPor,mShowOrigin,mShowDestination,mShowCurrent = true,mTwinkleCurrent = true;
|
|
|
|
|
|
|
|
public void setShowPol(boolean show) {
|
|
public void setShowPol(boolean show) {
|
|
|
mShowPol = show;
|
|
mShowPol = show;
|
|
@@ -570,6 +570,14 @@ public class ShipMap extends RelativeLayout implements GoogleMap.OnMarkerClickLi
|
|
|
mListener = listener;
|
|
mListener = listener;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ public void setTwinkleCurrent(boolean twinkleCurrent) {
|
|
|
|
|
+ mTwinkleCurrent = twinkleCurrent;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ public boolean twinkleCurrent() {
|
|
|
|
|
+ return mTwinkleCurrent;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
public ShipMapListener getShipMapListener() {
|
|
public ShipMapListener getShipMapListener() {
|
|
|
return mListener;
|
|
return mListener;
|
|
|
}
|
|
}
|