Merge branch 'dev' into demo/shunyi_v2v_merge

modules/mogo-module-guide/src/main/java/com/mogo/module/guide/util/AnalyticsUtil.kt

@@ -7,7 +7,7 @@ import com.mogo.service.analytics.IMogoAnalytics
 
 object AnalyticsUtil {
 
-    const val INVOKE_TRACK_PLAY_PASS_ID = "v2x_play_pass"
+    const val INVOKE_TRACK_PLAY_PASS_ID = "mogu_play_pass"
     const val INVOKE_TRACK_PASS_TIME = "pass_time"
     const val INVOKE_TRACK_PLAY_TIME = "play_time"
 

modules/mogo-module-main/src/main/java/com/mogo/module/main/service/MogoMainService.java

@@ -82,7 +82,7 @@ class MogoMainService extends Service implements IMogoLocationListener {
         UiThreadHandler.postDelayed(() -> {
             Logger.d(TAG, "startTanluService ---------- ");
                     mServiceApis.getTanluApi().startTanluService();
-                }, 58_000L
+                }, 2_000L
         );
     }
 

modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/GridBtnManager.kt

@@ -39,6 +39,11 @@ class GridBtnManager(val context: Context, private val container: GridLayout, pr
         } else {
             GlideApp.with(context).load(button.iconRes).placeholder(button.iconRes).error(button.iconRes).into(img)
         }
+//        if (button.iconUrl.isNotEmpty()) {
+//            GlideApp.with(context).load(button.iconUrl).into(img)
+//        } else {
+//            GlideApp.with(context).load(button.iconRes).into(img)
+//        }
         content.text = button.title
         view.setOnClickListener {
             btnClickListener?.invoke(button)

modules/mogo-module-share/src/main/res/layout/item_share_btn.xml

@@ -28,7 +28,10 @@
         android:id="@+id/tvShareContent"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="上报拥堵"
+        android:text="上报拥堵上报拥堵上报拥堵上报拥堵"
+        android:maxEms="4"
+        android:singleLine="true"
+        android:ellipsize="end"
         android:textColor="@color/module_share_dialog_icon_text_color"
         android:textSize="@dimen/share_module_item"
         android:textStyle="bold" />