update demo

Author: onlylemi

demo/src/main/java/com/onlylemi/mapview/BitmapLayerTestActivity.java

@@ -60,11 +60,6 @@ public void onBitmapClick(BitmapLayer layer) {
             public void onMapLoadFail() {
                 Log.i(TAG, "onMapLoadFail");
             }
-
-            @Override
-            public void onGetCurrentMap(Bitmap bitmap) {
-                Log.i(TAG, "onGetCurrentMap");
-            }
         });
     }
 

demo/src/main/java/com/onlylemi/mapview/LocationLayerTestActivity.java

@@ -58,10 +58,6 @@ public void onMapLoadFail() {
 
             }
 
-            @Override
-            public void onGetCurrentMap(Bitmap bitmap) {
-
-            }
         });
 
 

demo/src/main/java/com/onlylemi/mapview/MapLayerTestActivity.java

@@ -38,18 +38,14 @@ protected void onCreate(Bundle savedInstanceState) {
             @Override
             public void onMapLoadSuccess() {
                 Log.i(TAG, "onMapLoadSuccess");
-                mapView.setCurrentRotateDegrees(60);
+                //mapView.setCurrentRotateDegrees(60);
             }
 
             @Override
             public void onMapLoadFail() {
                 Log.i(TAG, "onMapLoadFail");
             }
 
-            @Override
-            public void onGetCurrentMap(Bitmap bitmap) {
-                Log.i(TAG, "onGetCurrentMap");
-            }
         });
     }
 

demo/src/main/java/com/onlylemi/mapview/MarkLayerTestActivity.java

@@ -54,10 +54,6 @@ public void onMapLoadFail() {
 
             }
 
-            @Override
-            public void onGetCurrentMap(Bitmap bitmap) {
-
-            }
         });
     }
 }

demo/src/main/java/com/onlylemi/mapview/RouteLayerTestActivity.java

@@ -2,11 +2,9 @@
 
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.graphics.Point;
 import android.graphics.PointF;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 
@@ -17,7 +15,9 @@
 import com.onlylemi.mapview.library.utils.MapUtils;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Random;
 
 public class RouteLayerTestActivity extends AppCompatActivity {
 
@@ -40,7 +40,7 @@ protected void onCreate(Bundle savedInstanceState) {
         nodesContract = TestData.getNodesContactList();
         marks = TestData.getMarks();
         marksName = TestData.getMarksName();
-        MapUtils.init(nodes, nodesContract);
+        MapUtils.init(nodes.size(), nodesContract.size());
 
         mapView = (MapView) findViewById(R.id.mapview);
         Bitmap bitmap = null;
@@ -76,9 +76,6 @@ public void markIsClick(int num) {
             public void onMapLoadFail() {
             }
 
-            @Override
-            public void onGetCurrentMap(Bitmap bitmap) {
-            }
         });
     }
 
@@ -93,8 +90,17 @@ public boolean onOptionsItemSelected(MenuItem item) {
         if (mapView.isMapLoadFinish()) {
             switch (item.getItemId()) {
                 case R.id.route_layer_tsp:
-
-
+                    List<PointF> list = new ArrayList<>();
+                    list.add(marks.get(39));
+                    list.add(marks.get(new Random().nextInt(10)));
+                    list.add(marks.get(new Random().nextInt(10) + 10));
+                    list.add(marks.get(new Random().nextInt(10) + 20));
+                    list.add(marks.get(new Random().nextInt(10) + 9));
+                    List<Integer> routeList = MapUtils.getBestPathBetweenPoints(list, nodes,
+                            nodesContract);
+                    routeLayer.setNodeList(nodes);
+                    routeLayer.setRouteList(routeList);
+                    mapView.refresh();
                     break;
                 default:
                     break;