Merge branch 'feature/v1.0.0' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into feature/v1.0.0

libraries/map-amap/src/main/java/com/mogo/map/impl/amap/utils/MapStyleUtils.java

@@ -40,7 +40,7 @@ public class MapStyleUtils {
     public static RouteOverlayOptions getRouteOverlayOptions() {
         RouteOverlayOptions options = new RouteOverlayOptions();
         // 设置导航线路的宽度
-        options.setLineWidth( 16 );
+        options.setLineWidth( 10 );
         // 设置交通状况情况良好下的纹理位图
         options.setSmoothTraffic( colorToBitmap( ColorEnum.route_overlay_line_normal.getColor() ) );
         // 设置路线的图标

libraries/mogo-map-api/src/main/java/com/mogo/map/navi/MogoCalculatePath.java

@@ -1,5 +1,6 @@
 package com.mogo.map.navi;
 
+import android.text.TextUtils;
 import com.mogo.map.MogoLatLng;
 import java.util.List;
 
@@ -56,6 +57,11 @@ public class MogoCalculatePath {
     }
 
     public String getStrategyName() {
+        if (!TextUtils.isEmpty(mStrategyName)&&mStrategyName.contains(",")) {
+            String[] split = mStrategyName.split(",");
+            return split[0];
+        }
+
         return mStrategyName;
     }
 

modules/mogo-module-extensions/src/main/res/layout/module_map_layout_navi_info_panel.xml

@@ -19,7 +19,6 @@
         android:id="@+id/module_map_id_navi_next_info_distance"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignTop="@+id/module_map_id_navi_next_info_road_turn_icon"
         android:layout_marginTop="@dimen/module_ext_navi_info_panel_next_info_distance_marginTop"
         android:layout_toRightOf="@+id/module_map_id_navi_next_info_road_turn_icon"
         android:textColor="#282828"

modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/adapter/CalculatePathAdapter.java

@@ -16,8 +16,8 @@ import java.util.List;
  */
 public class CalculatePathAdapter extends RecycleBaseAdapter<MogoCalculatePath> {
 
-
     private String selectTag;
+
     /**
      *
      */
@@ -35,18 +35,24 @@ public class CalculatePathAdapter extends RecycleBaseAdapter<MogoCalculatePath>
 
         holder.itemView.setTag(R.id.tag_item, item);
         holder.itemView.setOnClickListener(onClickListener);
-        holder.itemView.setSelected(TextUtils.equals(item.getTagId(),selectTag));
+        holder.itemView.setSelected(TextUtils.equals(item.getTagId(), selectTag));
 
         View mName = holder.getView(R.id.amap_calculate_item_strategy_name);
         holder.setText(R.id.amap_calculate_item_strategy_name, item.getStrategyName());
         mName.setBackgroundResource(getStrategyNameBkgResId(holder.getLayoutPosition()));
 
-        if (holder.getLayoutPosition()>=2) {
+        if (holder.getLayoutPosition() >= 2) {
             mName.setVisibility(View.GONE);
         }
         holder.setText(R.id.amap_calculate_item_strategy_time, item.getTime());
         holder.setText(R.id.amap_calculate_item_strategy_distance, item.getDistance());
         holder.setText(R.id.amap_calculate_item_strategy_desc, item.getDesc());
+
+        if (TextUtils.isEmpty(item.getDesc())) {
+            holder.getView(R.id.amap_calculate_item_strategy_desc).setVisibility(View.GONE);
+        } else {
+            holder.getView(R.id.amap_calculate_item_strategy_desc).setVisibility(View.VISIBLE);
+        }
     }
 
     public void setOnClickListener(View.OnClickListener onClickListener) {

modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/ChoosePathFragment.kt

@@ -175,6 +175,9 @@ class ChoosePathFragment : BaseFragment(), IMogoNaviListener, IMogoVoiceCmdCallB
     mAdapter.setOnClickListener {
       var item = it.getTag(R.id.tag_item) as MogoCalculatePath
       selectPath(item)
+
+//      rv_search_result.scroto
+
     }
 
     SearchServiceHolder.getMarkerManger()

modules/mogo-module-search/src/main/res/drawable/shape_round_blue.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <solid android:color="#36599D"/>
+    <corners android:radius="@dimen/dp_16"/>
+</shape>
+

modules/mogo-module-search/src/main/res/layout/fragment_search.xml

@@ -205,6 +205,7 @@
       app:layout_constraintTop_toBottomOf="@id/tv_navi_park"
       app:layout_constraintLeft_toLeftOf="@id/tv_navi_gas"
       android:text="@string/navi_setting"
+      android:background="@drawable/shape_round_blue"
       android:layout_marginTop="@dimen/dp_32"
       style="@style/txt_navi_style"
       />

modules/mogo-module-search/src/main/res/layout/item_calculate_path_map.xml

@@ -12,12 +12,13 @@
         android:layout_width="wrap_content"
         android:layout_height="@dimen/dp_48"
         android:layout_marginLeft="@dimen/dp_40"
-        android:layout_marginTop="@dimen/dp_26"
         android:background="@drawable/amap_calculate_navi_strategy_name_bkg"
         android:gravity="center"
         android:paddingLeft="8.5dp"
         android:paddingRight="8.5dp"
         android:textColor="#ccffffff"
+        app:layout_constraintVertical_chainStyle="packed"
+        app:layout_constraintBottom_toTopOf="@+id/amap_calculate_item_strategy_time"
         android:textSize="@dimen/sp_30"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -32,7 +33,8 @@
         android:textSize="@dimen/dp_50"
         app:layout_constraintLeft_toLeftOf="parent"
         android:layout_marginLeft="@dimen/dp_40"
-
+        app:layout_constraintVertical_chainStyle="packed"
+        app:layout_constraintBottom_toTopOf="@+id/amap_calculate_item_strategy_desc"
         app:layout_constraintTop_toBottomOf="@+id/amap_calculate_item_strategy_name"
         tools:text="40小时55分" />
 
@@ -70,6 +72,8 @@
         android:layout_height="@dimen/dp_42"
         android:layout_marginTop="2dp"
         android:gravity="center"
+        app:layout_constraintVertical_chainStyle="packed"
+        app:layout_constraintBottom_toBottomOf="parent"
         android:textColor="@color/white_80"
         android:textSize="@dimen/dp_30"
         app:layout_constraintLeft_toLeftOf="@+id/amap_calculate_item_strategy_time"

modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java

@@ -12,6 +12,7 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
@@ -84,6 +85,7 @@ import com.mogo.service.datamanager.IMogoDataChangedListener;
 import com.mogo.service.fragmentmanager.IMogoFragmentManager;
 import com.mogo.service.imageloader.IMogoImageLoaderListener;
 import com.mogo.service.imageloader.IMogoImageloader;
+import com.mogo.service.imageloader.MogoImageView;
 import com.mogo.service.intent.IMogoIntentListener;
 import com.mogo.service.intent.IMogoIntentManager;
 import com.mogo.service.map.IMogoMapService;
@@ -126,7 +128,8 @@ import static com.mogo.module.tanlu.video.VideoInitKt.initVideo;
 
     private static final String TAG = "TanluCardViewFragment";
     SimpleCoverVideoPlayer simpleCoverVideoPlayer;
-    AutoZoomInImageView autoZoomInImageView;
+//    AutoZoomInImageView autoZoomInImageView;
+    ImageView autoZoomInImageView;
     //map
     private IMogoMarkerManager mMarkerManager;
     private IMogoMapService mMogoMapService;
@@ -603,16 +606,16 @@ import static com.mogo.module.tanlu.video.VideoInitKt.initVideo;
     /**
      * 执行图片动画
      */
-    private void handleImageAnimation() {
-        autoZoomInImageView.post(new Runnable() {
-            @Override
-            public void run() {
-                //放大增量是0.3，放大时间是1000毫秒，放大开始时间是500毫秒以后
-                autoZoomInImageView.init()
-                        .startZoomInByScaleDeltaAndDuration(0.2f, 1000, 300);
-            }
-        });
-    }
+//    private void handleImageAnimation() {
+//        autoZoomInImageView.post(new Runnable() {
+//            @Override
+//            public void run() {
+//                //放大增量是0.3，放大时间是1000毫秒，放大开始时间是500毫秒以后
+//                autoZoomInImageView.init()
+//                        .startZoomInByScaleDeltaAndDuration(0.2f, 1000, 300);
+//            }
+//        });
+//    }
 
     /**
      * marker点击事件
@@ -706,6 +709,8 @@ import static com.mogo.module.tanlu.video.VideoInitKt.initVideo;
         Logger.d(TAG, "refreshPhoto thumbnailUrl ------>" + thumbnailUrl);
         simpleCoverVideoPlayer.setVisibility(View.GONE);
         autoZoomInImageView.setVisibility(View.VISIBLE);
+//        mogoImageloader.displayImage(thumbnailUrl, autoZoomInImageView);
+
         mogoImageloader.downloadImage(getActivity(), thumbnailUrl, new IMogoImageLoaderListener() {
             @Override
             public void onStart() {
@@ -717,7 +722,7 @@ import static com.mogo.module.tanlu.video.VideoInitKt.initVideo;
                 Log.d(TAG, "onCompleted ------>bitmap = " + bitmap);
                 autoZoomInImageView.setImageBitmap(bitmap);
                 //动画
-                handleImageAnimation();
+//                handleImageAnimation();
             }
 
             @Override
@@ -842,13 +847,13 @@ import static com.mogo.module.tanlu.video.VideoInitKt.initVideo;
                     e.printStackTrace();
                 }
             } else {
-                try {
-                    if ( autoZoomInImageView.getVisibility() == View.VISIBLE ) {
-                        autoZoomInImageView.stopCurrentAnimator();
-                    }
-                } catch ( Exception e ) {
-                    e.printStackTrace();
-                }
+//                try {
+//                    if ( autoZoomInImageView.getVisibility() == View.VISIBLE ) {
+//                        autoZoomInImageView.stopCurrentAnimator();
+//                    }
+//                } catch ( Exception e ) {
+//                    e.printStackTrace();
+//                }
             }
         }
 

modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler.xml

@@ -27,10 +27,10 @@
                 android:ellipsize="end"
                 android:gravity="center_vertical"
                 android:maxLines="1"
-                android:text="@string/main_empty_location"
                 android:textColor="@color/white"
                 android:textSize="@dimen/tanlu_module_card_address_size"
                 android:textStyle="bold" />
+<!--            android:text="@string/main_empty_location"-->
 
             <TextView
                 android:id="@+id/tv_distance_video"
@@ -40,10 +40,10 @@
                 android:layout_marginLeft="@dimen/tanlu_module_card_margin_left"
                 android:layout_marginTop="@dimen/tanlu_module_card_distance_margin_top"
                 android:layout_marginBottom="@dimen/tanlu_module_card_distance_margin_bottom"
-                android:text="666KM"
                 android:textColor="@color/color_99FFFFFF"
                 android:textSize="@dimen/tanlu_module_card_distance_size"
                 android:textStyle="bold" />
+<!--            android:text="0KM"-->
 
             <TextView
                 android:id="@+id/tv_information_media_time"
@@ -53,9 +53,10 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:layout_marginRight="@dimen/tanlu_module_card_margin_left"
-                android:text="2019-10-10"
                 android:textColor="@color/color_99FFFFFF"
                 android:textSize="@dimen/tanlu_module_card_distance_size" />
+<!--            android:text="2019-10-10"-->
+
         </RelativeLayout>
 
         <!--视频播放器和图片播放器-->
@@ -75,7 +76,12 @@
                 android:layout_height="match_parent"
                 android:visibility="gone" />
 
-            <com.mogo.module.tanlu.view.AutoZoomInImageView
+<!--            <com.mogo.module.tanlu.view.AutoZoomInImageView-->
+<!--                android:id="@+id/tanlu_photo_imageView"-->
+<!--                android:layout_width="match_parent"-->
+<!--                android:layout_height="match_parent" />-->
+
+            <ImageView
                 android:id="@+id/tanlu_photo_imageView"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent" />