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

2020-11-10 20:34:47 +08:00
parent 1f766eb906 4bd9eb24d2
commit 7137b4e365
34 changed files with 158 additions and 68 deletions
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpButton.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpButton.java
@@ -54,7 +54,7 @@ public class V2XSeekHelpButton implements IV2XButton {
            tv = V2XServiceManager.getMogoEntranceButtonController().getButton(ButtonIndex.BUTTON2);
            tv.setText("取消\n求助");
            tv.setVisibility(View.VISIBLE);
-            tv.setBackgroundResource(R.drawable.bg_v2x_event_live_show);
+            tv.setBackgroundResource(R.drawable.bg_v2x_cancel_help);
            tv.setOnClickListener(v -> {
                //调用取消求助接口
                // TODO: 2020/5/18 回调，显示对话框