diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java
index 28bb7438e5..2c404644cf 100644
--- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java
+++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java
@@ -14,6 +14,7 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.animation.Interpolator;
 
+import com.alibaba.idst.nls.internal.utils.L;
 import com.amap.api.maps.AMap;
 import com.amap.api.maps.AMapUtils;
 import com.amap.api.maps.CameraUpdateFactory;
@@ -462,8 +463,10 @@ public class AMapNaviViewWrapper implements IMogoMapView,
                 break;
             case NorthUP_2D:
                 mMapView.setNaviMode( AMapNaviView.NORTH_UP_MODE );
-                break;
+             break;
         }
+
+        Logger.d(TAG,"mCurrentUIMode--->"+mCurrentUIMode.name());
         if ( options == null ) {
             return;
         }
diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/adapter/SearchCategoryAdapter.java b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/adapter/SearchCategoryAdapter.java
index 12d58f4d3d..93004f9f43 100644
--- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/adapter/SearchCategoryAdapter.java
+++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/adapter/SearchCategoryAdapter.java
@@ -33,22 +33,19 @@ public class SearchCategoryAdapter extends RecycleBaseAdapter<MogoPoiItem> {
     @Override
     public void onBindViewHolder(RecycleViewHolder holder, MogoPoiItem tip) {
 
-
-
         int layoutPosition = holder.getLayoutPosition();
 
-        if (layoutPosition==0) {
-            holder.itemView.setBackgroundResource(R.drawable.selector_first_item_category_background);
-        }else {
+        if (layoutPosition == 0) {
+            holder.itemView.setBackgroundResource(
+                R.drawable.selector_first_item_category_background);
+        } else {
             holder.itemView.setBackgroundResource(R.drawable.selector_item_category_background);
-
         }
 
-
         holder.setText(R.id.tv_position, tip.getTitle());
         holder.setText(R.id.tv_position_des, tip.getSnippet());
 
-        holder.setText(R.id.iv_position,String.valueOf(holder.getLayoutPosition()+1));
+        holder.setText(R.id.iv_position, String.valueOf(holder.getLayoutPosition() + 1));
         holder.itemView.setTag(R.id.tag_position, holder.getLayoutPosition());
         holder.itemView.setOnClickListener(onClickListener);
         holder.itemView.setSelected(current == holder.getLayoutPosition());
@@ -71,10 +68,10 @@ public class SearchCategoryAdapter extends RecycleBaseAdapter<MogoPoiItem> {
 
     public void setCurrent(int current) {
 
-        if (current==this.current) {
+        if (current == this.current) {
             return;
         }
-        this.lastPosition=this.current;
+        this.lastPosition = this.current;
         this.current = current;
         notifyItemChanged(lastPosition);
         notifyItemChanged(current);
@@ -84,11 +81,14 @@ public class SearchCategoryAdapter extends RecycleBaseAdapter<MogoPoiItem> {
         return current;
     }
 
-    public int getLastPosition(){
+    public int getLastPosition() {
         return lastPosition;
     }
 
-    public MogoPoiItem getCurrentItem(){
+    public MogoPoiItem getCurrentItem() {
+        if (current >= list.size()) {
+            return null;
+        }
         return list.get(current);
     }
 }
diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/CategorySearchFragment.kt b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/CategorySearchFragment.kt
index 5d463bda01..4d81850232 100644
--- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/CategorySearchFragment.kt
+++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/CategorySearchFragment.kt
@@ -113,9 +113,13 @@ class CategorySearchFragment : BaseFragment(), CategoryView, IMogoVoiceCmdCallBa
 
   private fun addMarkers() {
     addMarkers.clear()
-    var marginBounder = resources.getDimensionPixelSize(R.dimen.dp_60)*2
+    var marginBounder = resources.getDimensionPixelSize(R.dimen.dp_60) * 2
     SearchServiceHolder.getMapUIController()
-        .showBounds(TAG, null, locationList, Rect(cv_search_result.width+marginBounder,marginBounder, marginBounder, marginBounder), false)
+        .showBounds(
+            TAG, null, locationList, Rect(
+            cv_search_result.width + marginBounder, marginBounder, marginBounder, marginBounder
+        ), false
+        )
 
     for (options in arrayList) {
       var addMarker = SearchServiceHolder.getMarkerManger()
@@ -218,8 +222,10 @@ class CategorySearchFragment : BaseFragment(), CategoryView, IMogoVoiceCmdCallBa
   }
 
   private fun goPath() {
-    var newInstance = ChoosePathFragment.newInstance(mAdapter.currentItem.point)
-    SearchServiceHolder.push(newInstance, MogoModulePaths.PATH_FRAGMENT_CHOOSE_PAHT)
+    mAdapter.currentItem?.let {
+      var newInstance = ChoosePathFragment.newInstance(mAdapter.currentItem.point)
+      SearchServiceHolder.push(newInstance, MogoModulePaths.PATH_FRAGMENT_CHOOSE_PAHT)
+    }
   }
 
   private fun updateMarker() {
diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/ChoosePathFragment.kt b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/ChoosePathFragment.kt
index 1b1559d9ed..087058a975 100644
--- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/ChoosePathFragment.kt
+++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/ChoosePathFragment.kt
@@ -216,12 +216,12 @@ class ChoosePathFragment : BaseFragment(), IMogoNaviListener, IMogoVoiceCmdCallB
 
   }
 
-  private fun registerRetryVoice(){
+  private fun registerRetryVoice() {
     AIAssist.getInstance(context)
         .registerUnWakeupCommand("retry", arrayOf<String>("重试"), this)
   }
 
-  private fun unregisterRetryVoice(){
+  private fun unregisterRetryVoice() {
     AIAssist.getInstance(context)
         .unregisterUnWakeupCommand("retry")
 
@@ -235,6 +235,9 @@ class ChoosePathFragment : BaseFragment(), IMogoNaviListener, IMogoVoiceCmdCallB
   }
 
   private fun startNavi() {
+    if (TextUtils.isEmpty(mAdapter.selectTag)) {
+      return
+    }
     moveMapToRight()
 
     SearchServiceHolder.getNavi()