Merge branch 'dev' into demo/shunyi_v2v_merge

modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingAdapter.java

@@ -82,13 +82,11 @@ public class V2XSurroundingAdapter extends RecyclerView.Adapter<V2XSurroundingVi
         });
 
         //数据绑定
-        Glide.with(mContext)
-                .load(getTypeRes(surroundingConstruction.getPoiType()))
-                .into(mBgImageView);
-
 //        Glide.with(mContext)
-//                .load(getTypeSmallRes(surroundingConstruction.getPoiType()))
-//                .into(mTypeImageView);
+//                .load(getTypeRes(surroundingConstruction.getPoiType()))
+//                .into(mBgImageView);
+
+        mBgImageView.setBackgroundResource(getTypeRes(surroundingConstruction.getPoiType()));
 
         RequestOptions requestOptions = new RequestOptions()
                 .placeholder(R.drawable.v2x_icon_live_logo)

modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt

@@ -51,7 +51,7 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
     // 打开出行动态TAB
     private val mCheckHistoryEventCb = V2XVoiceCallbackListener { command: String?, intent: Intent? ->
         try {
-            rbScenarioHistory?.isChecked=true
+            rbScenarioHistory?.isChecked = true
         } catch (e: java.lang.Exception) {
             e.printStackTrace()
         }
@@ -60,7 +60,7 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
     // 打开周边事件TAB
     private val mCheckSurroundingCb = V2XVoiceCallbackListener { command: String?, intent: Intent? ->
         try {
-            rbSurroundingEvent?.isChecked=true
+            rbSurroundingEvent?.isChecked = true
         } catch (e: java.lang.Exception) {
             e.printStackTrace()
         }
@@ -69,7 +69,7 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
     // 打开我的分享TAB
     private val mCheckShearEventCb = V2XVoiceCallbackListener { command: String?, intent: Intent? ->
         try {
-            rbShareEvents?.isChecked=true
+            rbShareEvents?.isChecked = true
         } catch (e: java.lang.Exception) {
             e.printStackTrace()
         }
@@ -126,9 +126,11 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
 
             mV2XEventPanelHistoryCountView = V2XEventPanelHistoryCountView(context)
             mV2XEventPanelHistoryCountView!!.setOnClickListener {
-                if (!isPanelShow()) {
-                    TrackUtils.trackV2xHistoryEvent(1)
-                    showPanel()
+                if (clPanelContainer != null) {
+                    if (!isPanelShow()) {
+                        TrackUtils.trackV2xHistoryEvent(1)
+                        showPanel()
+                    }
                 }
             }
             V2XServiceManager.getMogoEntranceButtonController().addBottomLayerView(mV2XEventPanelHistoryCountView)

modules/mogo-module-v2x/src/main/res/layout/module_fragment_surrounding_event_item.xml

@@ -7,9 +7,9 @@
     <ImageView
         android:id="@+id/iv_event_bg"
         android:scaleType="fitXY"
-        android:src="@drawable/mogo_image_nongwu_nor"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
+<!--    android:src="@drawable/mogo_image_nongwu_nor"-->
 
     <RelativeLayout
         android:layout_alignParentBottom="true"

modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml

@@ -31,9 +31,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
         android:layout_centerInParent="true"
-        android:gravity="left"
-        android:paddingRight="@dimen/dp_24"
-        android:paddingLeft="@dimen/dp_24"
+        android:paddingRight="@dimen/dp_28"
         android:text="100"
         android:textColor="#FFFFFF"
         android:textSize="@dimen/dp_34" />
@@ -54,9 +52,8 @@
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
         android:layout_toLeftOf="@id/road_case_useless"
-        android:gravity="center"
-        android:paddingRight="@dimen/dp_24"
-        android:paddingLeft="@dimen/dp_24"
+        android:gravity="left"
+        android:paddingRight="@dimen/dp_28"
         android:text="100"
         android:textColor="#FFFFFF"
         android:textSize="@dimen/dp_34" />

modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml

@@ -56,7 +56,7 @@
     <dimen name="module_v2x_surrounding_item_bottom_left_textsize">20px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom_right_textsize">16px</dimen>
     <dimen name="module_v2x_des_index_width">17px</dimen>
-    <dimen name="module_v2x_des_index_height">15.4px</dimen>
+    <dimen name="module_v2x_des_index_height">14px</dimen>
     <dimen name="module_v2x_panel_width">82px</dimen>
     <dimen name="module_v2x_panel_icon_cor">16px</dimen>
     <dimen name="share_empty_icon_width">117px</dimen>

modules/mogo-module-v2x/src/main/res/values/dimens.xml

@@ -57,8 +57,8 @@
     <dimen name="module_v2x_surrounding_top_textsize">18px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom_left_textsize">20px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom_right_textsize">16px</dimen>
-    <dimen name="module_v2x_des_index_width">16px</dimen>
-    <dimen name="module_v2x_des_index_height">20px</dimen>
+    <dimen name="module_v2x_des_index_width">20px</dimen>
+    <dimen name="module_v2x_des_index_height">16px</dimen>
     <dimen name="module_v2x_panel_width">82px</dimen>
     <dimen name="module_v2x_panel_icon_cor">16px</dimen>
     <dimen name="share_empty_icon_width">117px</dimen>