diff --git a/gradle.properties b/gradle.properties index 2f2ecde051..d3345f343c 100644 --- a/gradle.properties +++ b/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 diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareVoiceCmdReceiver.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareVoiceCmdReceiver.kt index 3b2cd1e96e..777a3569dc 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareVoiceCmdReceiver.kt +++ b/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) diff --git a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_block_up.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_block_up.png index ab5e22a384..d2f7197cce 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_block_up.png and b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_block_up.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_closure.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_closure.png index 0e20d530b5..f6e8d2b499 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_closure.png and b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_closure.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_seek_help.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_seek_help.png new file mode 100644 index 0000000000..c87f75fd0d Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_seek_help.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_traffic_check.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_traffic_check.png index 3fe74d1514..737a4c75a8 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_traffic_check.png and b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_traffic_check.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_block_up.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_block_up.png index aa80dfe42f..0d33d14d6c 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_block_up.png and b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_block_up.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_road_closure.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_road_closure.png index 7726fc04d4..0356075b5d 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_road_closure.png and b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_road_closure.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_seek_help.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_seek_help.png new file mode 100644 index 0000000000..018f787003 Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_seek_help.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_traffic_check.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_traffic_check.png index 18e28e06f7..d9139b14e3 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_traffic_check.png and b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_traffic_check.png differ diff --git a/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share_2.xml b/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share_2.xml index 06ea3db506..7c4e60d6bc 100644 --- a/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share_2.xml +++ b/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 @@