diff --git a/.classpath b/.classpath
index ea6f981..357503b 100644
--- a/.classpath
+++ b/.classpath
@@ -4,7 +4,6 @@
-
diff --git a/bin/Lijiang.apk b/bin/Lijiang.apk
index 61d0112..6e7692e 100644
Binary files a/bin/Lijiang.apk and b/bin/Lijiang.apk differ
diff --git a/bin/classes.dex b/bin/classes.dex
index c9850f5..add4c2b 100644
Binary files a/bin/classes.dex and b/bin/classes.dex differ
diff --git a/bin/classes/com/utopia/lijiang/AppInitializer.class b/bin/classes/com/utopia/lijiang/AppInitializer.class
deleted file mode 100644
index c8496a3..0000000
Binary files a/bin/classes/com/utopia/lijiang/AppInitializer.class and /dev/null differ
diff --git a/bin/classes/com/utopia/lijiang/LijiangActivity.class b/bin/classes/com/utopia/lijiang/LijiangActivity.class
index 736400d..8d3e39f 100644
Binary files a/bin/classes/com/utopia/lijiang/LijiangActivity.class and b/bin/classes/com/utopia/lijiang/LijiangActivity.class differ
diff --git a/bin/classes/com/utopia/lijiang/R$id.class b/bin/classes/com/utopia/lijiang/R$id.class
index 0f753cf..ef06e79 100644
Binary files a/bin/classes/com/utopia/lijiang/R$id.class and b/bin/classes/com/utopia/lijiang/R$id.class differ
diff --git a/bin/classes/com/utopia/lijiang/R$layout.class b/bin/classes/com/utopia/lijiang/R$layout.class
index b0924a8..787c0e5 100644
Binary files a/bin/classes/com/utopia/lijiang/R$layout.class and b/bin/classes/com/utopia/lijiang/R$layout.class differ
diff --git a/bin/classes/com/utopia/lijiang/R$string.class b/bin/classes/com/utopia/lijiang/R$string.class
index 9d3bd3d..4a6b3e3 100644
Binary files a/bin/classes/com/utopia/lijiang/R$string.class and b/bin/classes/com/utopia/lijiang/R$string.class differ
diff --git a/bin/resources.ap_ b/bin/resources.ap_
index 6a777fc..74d9352 100644
Binary files a/bin/resources.ap_ and b/bin/resources.ap_ differ
diff --git a/libs/armeabi/libBMapApiEngine.so b/libs/armeabi/libBMapApiEngine.so
deleted file mode 100644
index 43670da..0000000
Binary files a/libs/armeabi/libBMapApiEngine.so and /dev/null differ
diff --git a/libs/baidumapapi.jar b/libs/baidumapapi.jar
deleted file mode 100644
index 7910067..0000000
Binary files a/libs/baidumapapi.jar and /dev/null differ
diff --git a/src/com/utopia/lijiang/BaiduMapActivity.java b/src/com/utopia/lijiang/BaiduMapActivity.java
deleted file mode 100644
index 49b7594..0000000
--- a/src/com/utopia/lijiang/BaiduMapActivity.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.utopia.lijiang;
-
-import android.util.Log;
-
-import com.baidu.mapapi.BMapManager;
-import com.baidu.mapapi.MapActivity;
-
-
-public class BaiduMapActivity extends MapActivity {
- protected BMapManager mBMapMan = null;
- protected String apiKey = null;
-
- protected void initMapActivity(){
- Log.d(getString(R.string.debug_tag),"BaiduMapActivity.initMapActivity()");
- apiKey = this.getString(R.string.baidu_key);
- mBMapMan = new BMapManager(this.getApplication());
- mBMapMan.init(apiKey, null);
- super.initMapActivity(mBMapMan);
- }
-
-
- @Override
- protected boolean isRouteDisplayed() {
- // TODO Auto-generated method stub
- return false;
- }
-
- @Override
- protected void onDestroy() {
- Log.d(getString(R.string.debug_tag),"BaiduMapActivity.onDestroy()");
-
- if (mBMapMan != null) {
- mBMapMan.destroy();
- mBMapMan = null;
- }
- super.onDestroy();
- }
- @Override
- protected void onPause() {
- Log.d(getString(R.string.debug_tag),"BaiduMapActivity.onPause()");
- if (mBMapMan != null) {
- mBMapMan.stop();
- }
- super.onPause();
- }
- @Override
- protected void onResume() {
- Log.d(getString(R.string.debug_tag),"BaiduMapActivity.onResume()");
- if (mBMapMan != null) {
- mBMapMan.start();
- }
- super.onResume();
- }
-}
diff --git a/src/com/utopia/lijiang/BaiduMapDemoActivity.java b/src/com/utopia/lijiang/BaiduMapDemoActivity.java
deleted file mode 100644
index bba70e1..0000000
--- a/src/com/utopia/lijiang/BaiduMapDemoActivity.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.utopia.lijiang;
-
-import com.baidu.mapapi.BMapManager;
-import com.baidu.mapapi.GeoPoint;
-import com.baidu.mapapi.LocationListener;
-import com.baidu.mapapi.MapActivity;
-import com.baidu.mapapi.MapView;
-import com.baidu.mapapi.MyLocationOverlay;
-
-import android.location.Location;
-import android.os.Bundle;
-
-public class BaiduMapDemoActivity extends MapActivity {
-
- BMapManager mBMapMan = null;
- MapView mMapView = null;
- LocationListener mLocationListener = null;
- MyLocationOverlay mLocationOverlay = null;
-
-
- protected void onCreate(Bundle savedInstanceState) {
-
- super.onCreate(savedInstanceState);
- setContentView(R.layout.baidumapdemo);
-
- if (mBMapMan == null) {
- mBMapMan = new BMapManager(getApplication());
- mBMapMan.init("DBC116220F2040B76081BF632757104D2960CF1A", null);
- }
- mBMapMan.start();
- super.initMapActivity(mBMapMan);
-
- mMapView = (MapView)findViewById(R.id.bmapsView);
- mMapView.setBuiltInZoomControls(true);
- mMapView.setDrawOverlayWhenZooming(true);
-
- mLocationOverlay = new MyLocationOverlay(this, mMapView);
- mMapView.getOverlays().add(mLocationOverlay);
-
- mLocationListener = new LocationListener(){
-
- @Override
- public void onLocationChanged(Location location) {
- if (location != null){
- GeoPoint pt = new GeoPoint((int)(location.getLatitude()*1e6),
- (int)(location.getLongitude()*1e6));
- mMapView.getController().animateTo(pt);
- }
- }
- };
- }
-
- @Override
- protected void onPause() {
- mBMapMan.getLocationManager().removeUpdates(mLocationListener);
- mLocationOverlay.disableMyLocation();
- mLocationOverlay.disableCompass();
- mBMapMan.stop();
- super.onPause();
- }
- @Override
- protected void onResume() {
- mBMapMan.getLocationManager().requestLocationUpdates(mLocationListener);
- mLocationOverlay.enableMyLocation();
- mLocationOverlay.enableCompass();
- mBMapMan.start();
- super.onResume();
- }
-
- @Override
- protected boolean isRouteDisplayed() {
- // TODO Auto-generated method stub
- return false;
- }
-}
\ No newline at end of file
diff --git a/src/com/utopia/lijiang/LijiangActivity.java b/src/com/utopia/lijiang/LijiangActivity.java
index f6648fc..52670b1 100644
--- a/src/com/utopia/lijiang/LijiangActivity.java
+++ b/src/com/utopia/lijiang/LijiangActivity.java
@@ -67,9 +67,7 @@ public void onDestroy(){
* */
public void showAddAlarmActivity(View target){
//Just test Map
- Intent i = new Intent(this,BaiduMapDemoActivity.class);
- this.startActivity(i);
- //this.startActivity(new Intent(this,AddSimpleAlarmActivity.class));
+ this.startActivity(new Intent(this,AddSimpleAlarmActivity.class));
}
public void showAlarms(View target){