map-per/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[yop] After-merge fixes.

Browse source
This commit is contained in:
Dmitry Kunin 2013-09-05 15:36:14 +03:00 • committed by Alex Zolotarev
parent c45d59e4da
commit ae5d52dedb
2 changed files with 9 additions and 175 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
android/YoPme/src/com/mapswithme/yopme/BackscreenActivity.java
View file

@ -15,7 +15,7 @@ import android.widget.TextView;
import com.mapswithme.maps.api.MWMPoint;
import com.mapswithme.yopme.map.MapData;
import com.mapswithme.yopme.map.MapDataProvider;
import com.mapswithme.yopme.map.MockMapDataProvider;
import com.mapswithme.yopme.map.MapRenderer;
import com.yotadevices.sdk.BSActivity;
import com.yotadevices.sdk.BSMotionEvent;
import com.yotadevices.sdk.BSDrawer.Waveform;
@ -57,7 +57,10 @@ public class BackscreenActivity extends BSActivity
{
super.onBSCreate();
mMapDataProvider = new MockMapDataProvider(this);
mMapDataProvider = new MapRenderer(
(int)getResources().getDimension(R.dimen.yota_width),
(int)getResources().getDimension(R.dimen.yota_width));
setUpView();
}
@ -208,6 +211,10 @@ public class BackscreenActivity extends BSActivity
public void updateData()
{
MapData data = null;
if (mMode == null)
return;
if (mMode == Mode.LOCATION)
{
if (mLocation == null)

173
android/YoPme/src/com/mapswithme/yopme/bs/BackscreenBase.java
View file

@ -1,173 +0,0 @@
package com.mapswithme.yopme.bs;
import com.mapswithme.yopme.BackscreenActivity;
import com.mapswithme.yopme.R;
import com.mapswithme.yopme.State;
import com.mapswithme.yopme.map.MapDataProvider;
import com.mapswithme.yopme.map.MapRenderer;
import com.yotadevices.sdk.BSActivity;
import com.yotadevices.sdk.BSDrawer;
import com.yotadevices.sdk.BSMotionEvent;
import com.yotadevices.sdk.BSDrawer.Waveform;
import com.yotadevices.sdk.Constants.Gestures;
import android.content.Context;
import android.graphics.Bitmap;
import android.location.Location;
import android.location.LocationListener;
import android.location.LocationManager;
import android.os.Bundle;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
public abstract class BackscreenBase implements LocationListener
{
protected View mView;
protected ImageView mMapView;
protected TextView mPoiText;
protected TextView mWaitMessage;
protected View mWaitScreen;
protected BSActivity mBsActivity;
protected int mResId;
protected MapDataProvider mMapDataProvider;
protected State mState;
protected double mZoomLevel = MapDataProvider.ZOOM_DEFAULT;
public BackscreenBase(BSActivity bsActivity, State state)
{
mBsActivity = bsActivity;
mState = state;
mResId = R.layout.yota_backscreen;
//TODO: you know what to do with mocks
mMapDataProvider = MapRenderer.GetRenderer();
setUpView();
updateView(state);
};
public BackscreenBase(BSActivity bsActivity, int viewResId, State state)
{
this(bsActivity, state);
mResId = viewResId;
};
public void onCreate()
{
}
public void onResume()
{
invalidate();
}
public void setUpView()
{
mView = View.inflate(mBsActivity, mResId, null);
mMapView = (ImageView) mView.findViewById(R.id.map);
mPoiText = (TextView) mView.findViewById(R.id.poiText);
mWaitMessage = (TextView) mView.findViewById(R.id.waitMsg);
mWaitScreen = mView.findViewById(R.id.waitScreen);
}
protected void updateView(State state)
{
updateView(state.getBitmap(),
state.getPoint() != null ? state.getPoint().getName() : "");
}
protected void updateView(Bitmap backscreenBitmap, CharSequence text)
{
mMapView.setImageBitmap(backscreenBitmap);
mPoiText.setText(text);
}
public void invalidate()
{
draw();
}
public void onMotionEvent(BSMotionEvent motionEvent)
{
final Gestures action = motionEvent.getBSAction();
if (action == Gestures.GESTURES_BS_SINGLE_TAP)
requestLocationUpdate();
else if (action == Gestures.GESTURES_BS_LR)
zoomIn();
else if (action == Gestures.GESTURES_BS_RL)
zoomOut();
}
public void zoomIn()
{
if (mZoomLevel < MapDataProvider.MAX_ZOOM)
++mZoomLevel;
}
public void zoomOut()
{
if (mZoomLevel > MapDataProvider.MIN_ZOOM)
--mZoomLevel;
}
public void draw(BSDrawer drawer)
{
if (mView != null)
drawer.drawBitmap(mView, Waveform.WAVEFORM_GC_FULL);
}
protected void draw()
{
draw(mBsActivity.getBSDrawer());
}
protected void requestLocationUpdate()
{
final Context context = mBsActivity.getApplicationContext();
final LocationManager lm = (LocationManager)context.getSystemService(Context.LOCATION_SERVICE);
if (lm.isProviderEnabled(LocationManager.GPS_PROVIDER))
lm.requestSingleUpdate(LocationManager.GPS_PROVIDER, BackscreenActivity.getLocationPendingIntent(context));
else if (lm.isProviderEnabled(LocationManager.NETWORK_PROVIDER))
lm.requestSingleUpdate(LocationManager.NETWORK_PROVIDER, BackscreenActivity.getLocationPendingIntent(context));
else
throw new IllegalStateException("No providers found.");
showWaitMessage("Waiting for location ...");
}
@Override
public void onLocationChanged(Location location)
{
hideWaitMessage();
}
public void showWaitMessage(CharSequence msg)
{
mWaitMessage.setText(msg);
mWaitScreen.setVisibility(View.VISIBLE);
}
public void hideWaitMessage()
{
mWaitScreen.setVisibility(View.GONE);
}
@Override
public void onProviderDisabled(String provider)
{
}
@Override
public void onProviderEnabled(String provider)
{
}
@Override
public void onStatusChanged(String provider, int status, Bundle extras)
{
}
}