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

gradle.properties

@@ -74,5 +74,5 @@ MOGO_MODULE_PUSH_VERSION=1.0.1
 # 广告资源位
 MOGO_MODULE_AD_CARD_VERSION=1.0.1
 # 新鲜事
-MOGO_MODULE_FRESH_NEWS_VERSION=1.0.3.1
+MOGO_MODULE_FRESH_NEWS_VERSION=1.0.3.2
 

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

@@ -4,6 +4,7 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import com.mogo.module.share.constant.ShareConstants
+import com.mogo.utils.logger.Logger
 
 /**
  * 用于接收唤醒词指令，现在只接收 com.zhidao.speech.awake.notify 这一条广播
@@ -12,6 +13,7 @@ class ShareVoiceCmdReceiver : BroadcastReceiver() {
     override fun onReceive(context: Context, intent: Intent) {
         // todo 接收唤醒词指令
         val command = intent.getStringExtra("command")
+        Logger.d("ShareCmdReceiver", "收到唤醒词指令: $command")
         if (command == "zhunbeishangbao") {
             //todo 开启服务，准备上报求助
             val seekHelp = Intent(context, VoiceCmdService::class.java)

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

@@ -39,10 +39,12 @@
         android:drawablePadding="@dimen/share_module_tv_margin_top"
         android:gravity="center"
         android:text="上报拥堵"
+        app:layout_constraintHorizontal_chainStyle="spread_inside"
+        android:layout_marginStart="@dimen/dp_76"
         android:textColor="@color/white"
         android:textSize="@dimen/share_module_item"
         android:textStyle="bold"
-        android:layout_marginTop="@dimen/dp_30"
+        android:layout_marginTop="@dimen/dp_64"
         app:layout_constraintLeft_toLeftOf="@+id/vBg"
         app:layout_constraintRight_toLeftOf="@+id/tvTrafficCheck"
         app:layout_constraintTop_toBottomOf="@+id/btn_share_title" />
@@ -83,11 +85,12 @@
         android:id="@+id/tvNeedHelp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:drawableTop="@drawable/share_oil_price"
+        android:drawableTop="@drawable/share_seek_help"
         android:drawablePadding="@dimen/share_module_tv_margin_top"
         android:gravity="center"
-        android:text="故障求助"
+        android:text="发起求助"
         android:textColor="@color/white"
+        android:layout_marginEnd="@dimen/dp_76"
         android:textSize="@dimen/share_module_item"
         android:textStyle="bold"
         app:layout_constraintLeft_toRightOf="@+id/tvClosure"
@@ -98,11 +101,11 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="可以对小智说：上报拥堵、上报交通检查、上报封路"
+        android:text="可以对小智说：上报拥堵、上报交通检查、上报封路、发起求助"
         android:textColor="@color/white_40"
         android:textSize="@dimen/share_module_bottom_size"
         android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="@+id/vBg"
+        android:layout_marginTop="@dimen/dp_55"
         app:layout_constraintEnd_toEndOf="@+id/vBg"
         app:layout_constraintStart_toStartOf="@+id/vBg"
         app:layout_constraintTop_toBottomOf="@+id/tvBlock" />