Merge remote-tracking branch 'origin/dev' into dev

.idea/misc.xml

@@ -4,7 +4,7 @@
     <asm skipDebug="false" skipFrames="false" skipCode="false" expandFrames="false" />
     <groovy codeStyle="LEGACY" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
 </project>

libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt

@@ -136,6 +136,7 @@ class CosStatusController : CosStatusCallback {
             }
             Log.d(TAG, "videoAndThumbMap ${videoAndThumbMap}")
             if (videoAndThumbMap.size == 2) {
+                trackUploadCos(4)
                 Log.d(TAG, "videoAndThumbMap.size == 2 ")
                 var locationInfo = LocationUtil.getInstance().getLocationInfo()
                 val locationStr: String = Gson().toJson(locationInfo)
@@ -149,7 +150,6 @@ class CosStatusController : CosStatusCallback {
                         sendGetInfoFailedReceiver("100")
                     }
                 } else {
-                    trackUploadCos(4)
                     //分享成功，并打点，如果是上报拥堵，需要takeVideo
                     LatLngStickyEventBus.getInstance()
                             .postSticky(GetImageSuccessEvent(downloadUrl, mType))

modules/mogo-module-guide/src/main/res/values/strings.xml

@@ -6,9 +6,9 @@
     <string name="module_guide_skip">跳过</string>
 
     <string name="module_guide_voice_page_one">欢迎使用蘑菇出行，您下次可以直接对我说，打开蘑菇出行来直接进入应用，点击左下方按钮进行摄像头设置</string>
-    <string name="module_guide_voice_page_two"></string>
+    <string name="module_guide_voice_page_two">左边是道路事件的播报，点击右边地图上的事件标示可以查看事件详情</string>
     <string name="module_guide_voice_page_three">这里是道路信息显示，点击后可查看事件详情</string>
     <string name="module_guide_voice_page_four">这里是事件汇总，您可以查看您参与的事件和您的分享记录</string>
-    <string name="module_guide_voice_page_five">点击这里可以把路况分享给其他车友，或者直接对我说，上报路况</string>
+    <string name="module_guide_voice_page_five">更多设置，在左上角的设置功能中，点击右下角的分享，可以把路况分享给其他车友</string>
     <string name="module_guide_voice_page_end">我们希望让您的出行更加安全高效，更多功能等着你去发现，快去体验体验吧</string>
 </resources>

modules/mogo-module-v2x/src/main/res/drawable/v2x_drawable_event_more_bkg.xml

@@ -1,8 +0,0 @@
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape>
-            <corners android:radius="@dimen/module_v2x_panel_icon_cor" />
-            <gradient android:startColor="#FF2E3141" android:endColor="#FF3F435F" android:angle="0" />
-        </shape>
-    </item>
-</selector>

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

@@ -89,10 +89,10 @@
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="@+id/rgTabSelect" />
 
-<!--    <View-->
-<!--        android:layout_width="match_parent"-->
-<!--        android:layout_height="58px"-->
-<!--        android:background="@drawable/v2x_shadow_shape_view"-->
-<!--        app:layout_constraintBottom_toBottomOf="parent" />-->
+    <!--    <View-->
+    <!--        android:layout_width="match_parent"-->
+    <!--        android:layout_height="58px"-->
+    <!--        android:background="@drawable/v2x_shadow_shape_view"-->
+    <!--        app:layout_constraintBottom_toBottomOf="parent" />-->
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -5,15 +5,15 @@
     android:id="@+id/llEventMore"
     android:layout_width="@dimen/module_v2x_panel_width"
     android:layout_height="@dimen/module_v2x_panel_width"
-    android:background="@drawable/v2x_drawable_event_more_bkg"
+    android:background="@drawable/v2x_shadow_bg"
+    android:translationY="@dimen/v2x_panel_btn_translationY"
     app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toTopOf="parent"
-    tools:translationZ="1dp">
+    app:layout_constraintTop_toTopOf="parent">
 
     <ImageView
         android:id="@+id/btnShowOrHidePanels"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/v2x_panel_btn_image_width"
+        android:layout_height="@dimen/v2x_panel_btn_image_width"
         android:layout_centerInParent="true"
         android:src="@drawable/icon_event_panel_more" />
 

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

@@ -57,7 +57,7 @@
     <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_panel_width">66px</dimen>
+    <dimen name="module_v2x_panel_width">74px</dimen>
     <dimen name="module_v2x_panel_icon_cor">16px</dimen>
     <dimen name="share_empty_icon_width">117px</dimen>
     <dimen name="v2x_loading_ani_width">200px</dimen>
@@ -73,5 +73,7 @@
     <dimen name="share_index_bottom_padding">15px</dimen>
     <dimen name="share_btn_middle_padding">29px</dimen>
     <dimen name="v2x_panel_btn_translationY">-8px</dimen>
+    <dimen name="v2x_panel_btn_image_width">57px</dimen>
+
 
 </resources>

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

@@ -56,5 +56,6 @@
     <dimen name="module_v2x_des_index_height">42px</dimen>
     <dimen name="module_v2x_panel_cor">16px</dimen>
     <dimen name="module_v2x_panel_width">120px</dimen>
+    <dimen name="v2x_panel_btn_image_width">114px</dimen>
 
 </resources>

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

@@ -56,7 +56,7 @@
     <dimen name="module_v2x_des_index_width">31.9px</dimen>
     <dimen name="module_v2x_des_index_height">26px</dimen>
     <dimen name="module_v2x_panel_icon_cor">30px</dimen>
-    <dimen name="module_v2x_panel_width">120px</dimen>
+    <dimen name="module_v2x_panel_width">136px</dimen>
     <dimen name="share_empty_icon_width">219px</dimen>
     <dimen name="v2x_loading_ani_width">400px</dimen>
     <dimen name="v2x_share_btn_width">281px</dimen>
@@ -71,5 +71,7 @@
     <dimen name="share_index_bottom_padding">36px</dimen>
     <dimen name="share_btn_middle_padding">54px</dimen>
     <dimen name="v2x_panel_btn_translationY">-10px</dimen>
-    
+    <dimen name="v2x_panel_btn_image_width">114px</dimen>
+
+
 </resources>

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

@@ -57,7 +57,7 @@
     <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_panel_width">66px</dimen>
+    <dimen name="module_v2x_panel_width">74px</dimen>
     <dimen name="module_v2x_panel_icon_cor">16px</dimen>
     <dimen name="share_empty_icon_width">117px</dimen>
     <dimen name="v2x_loading_ani_width">200px</dimen>
@@ -73,6 +73,7 @@
     <dimen name="share_index_bottom_padding">15px</dimen>
     <dimen name="share_btn_middle_padding">29px</dimen>
     <dimen name="v2x_panel_btn_translationY">-8px</dimen>
+    <dimen name="v2x_panel_btn_image_width">38px</dimen>
 
 
 

skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_drawable_event_more_bkg_light.xml

@@ -1,8 +0,0 @@
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape>
-            <corners android:radius="@dimen/module_v2x_panel_icon_cor" />
-            <gradient android:startColor="#FFFFFFFF" android:endColor="#E5F5F5F5" android:angle="0" />
-        </shape>
-    </item>
-</selector>

skin/mogo-skin-light/src/main/module-v2x-res/values-xhdpi/dimens.xml

@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
-    <dimen name="module_v2x_panel_icon_cor">30px</dimen>
     <dimen name="module_v2x_surrounding_refresh_bt_radius">42px</dimen>
 </resources>
-
-

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

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="module_v2x_panel_icon_cor">16px</dimen>
     <dimen name="module_v2x_surrounding_refresh_bt_radius">24px</dimen>
 </resources>
 
-