From bdd1a2c2bf97496e0807c6a1db3a2df3a59f1ff0 Mon Sep 17 00:00:00 2001 From: liujing Date: Wed, 9 Dec 2020 16:39:14 +0800 Subject: [PATCH] =?UTF-8?q?[add]=20=E6=8E=A5=E6=94=B6=E4=BB=96=E4=BA=BA?= =?UTF-8?q?=E6=B1=82=E5=8A=A9=E5=BC=B9=E6=A1=86-=E7=BC=BA=E5=AF=BC?= =?UTF-8?q?=E8=88=AA=E5=88=B0=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/module/v2x/V2XConst.java | 2 +- .../v2x/adapter/holder/V2XOtherSeekHelpVH.java | 2 +- .../drawable-xhdpi/v2x_event_icon_talk_vr.png | Bin 0 -> 5368 bytes .../main/res/drawable/selector_talk_btn_vr.xml | 6 ++++++ .../main/res/layout/item_v2x_fault_help_vr.xml | 8 ++++---- 5 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_event_icon_talk_vr.png create mode 100644 modules/mogo-module-v2x/src/main/res/drawable/selector_talk_btn_vr.xml diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XConst.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XConst.java index f5fbe75e3a..360803731d 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XConst.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XConst.java @@ -137,5 +137,5 @@ public class V2XConst { /* * VR模式 * */ - public static final boolean VR_MODE = MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode(); + public static final boolean VR_MODE = true; } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java index fbc74ab555..977334632f 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java @@ -72,7 +72,7 @@ public class V2XOtherSeekHelpVH extends V2XBaseViewHolder { public V2XOtherSeekHelpVH(ViewGroup viewGroup) { super(LayoutInflater.from(viewGroup.getContext()) - .inflate(R.layout.item_v2x_fault_help, viewGroup, false)); + .inflate(VR_MODE ? R.layout.item_v2x_fault_help_vr : R.layout.item_v2x_fault_help, viewGroup, false)); ivHead = itemView.findViewById(R.id.ivFaultHelpHead); tvName = itemView.findViewById(R.id.tvFaultHelpName); tvDistance = itemView.findViewById(R.id.tvFaultHelpDistance); diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_event_icon_talk_vr.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_event_icon_talk_vr.png new file mode 100644 index 0000000000000000000000000000000000000000..5b1a5378b1eac748bc52315da56b0ef5fe9b943e GIT binary patch literal 5368 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 WiXPlL(Fm~s0000 + + + + + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help_vr.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help_vr.xml index d4d94d03f4..ed01bd0d88 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help_vr.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help_vr.xml @@ -92,8 +92,8 @@