diff --git a/modules/mogo-module-main/src/main/res/values/dimens.xml b/modules/mogo-module-main/src/main/res/values/dimens.xml index abb5b70e10..adabf11063 100644 --- a/modules/mogo-module-main/src/main/res/values/dimens.xml +++ b/modules/mogo-module-main/src/main/res/values/dimens.xml @@ -17,12 +17,12 @@ 319px 110px - 16px + 10px 15px 460px 444px 350px - 16px + 10px 16px 658px 8px diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew.java index d88eb7c9e9..edba6ffed2 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew.java @@ -333,16 +333,16 @@ public class TanluSlideAdapterNew extends RecyclerView.Adapter diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt index 30d2b671de..fd5a81a5aa 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt @@ -2,6 +2,10 @@ package com.mogo.module.v2x.fragment import android.content.Intent import android.view.View +import android.widget.ImageView +import android.widget.RadioButton +import android.widget.RadioGroup +import androidx.constraintlayout.widget.ConstraintLayout import androidx.fragment.app.Fragment import androidx.viewpager2.widget.ViewPager2 import com.google.android.material.tabs.TabLayoutMediator @@ -11,14 +15,12 @@ import com.mogo.module.v2x.V2XConst.MODULE_NAME import com.mogo.module.v2x.V2XServiceManager import com.mogo.module.v2x.adapter.V2XEventPagerAdapter import com.mogo.module.v2x.presenter.EventPanelPresenter -import com.mogo.module.v2x.presenter.ShareEventsPresenter import com.mogo.module.v2x.utils.TrackUtils import com.mogo.module.v2x.view.V2XEventPanelHistoryCountView import com.mogo.module.v2x.voice.V2XVoiceCallbackListener import com.mogo.module.v2x.voice.V2XVoiceConstants import com.mogo.module.v2x.voice.V2XVoiceManager import com.mogo.utils.logger.Logger -import kotlinx.android.synthetic.main.module_v2x_event_panel_fragment_event_panel.* /** @@ -38,6 +40,14 @@ class V2XEventPanelFragment : MvpFragment try { - rbScenarioHistory?.isChecked = true + mRbScenarioHistory?.isChecked = true } catch (e: java.lang.Exception) { e.printStackTrace() } @@ -60,7 +70,7 @@ class V2XEventPanelFragment : MvpFragment try { - rbSurroundingEvent?.isChecked = true + mRbSurroundingEvent?.isChecked = true } catch (e: java.lang.Exception) { e.printStackTrace() } @@ -69,7 +79,7 @@ class V2XEventPanelFragment : MvpFragment try { - rbShareEvents?.isChecked = true + mRbShareEvents?.isChecked = true } catch (e: java.lang.Exception) { e.printStackTrace() } @@ -92,48 +102,60 @@ class V2XEventPanelFragment : MvpFragment + mRgTabSelect?.setOnCheckedChangeListener { group, checkedId -> when (checkedId) { R.id.rbScenarioHistory -> { TrackUtils.trackV2xHistoryEvent(2) - vpEventPanel.setCurrentItem(0, false) + mVpEventPanel?.setCurrentItem(0, false) } R.id.rbSurroundingEvent -> { TrackUtils.trackV2xHistoryEvent(3) - vpEventPanel.setCurrentItem(1, false) + mVpEventPanel?.setCurrentItem(1, false) } R.id.rbShareEvents -> { TrackUtils.trackV2xHistoryEvent(4) - vpEventPanel.setCurrentItem(2, false) + mVpEventPanel?.setCurrentItem(2, false) } } } - btnHidePanels.setOnClickListener { + mBtnHidePanels?.setOnClickListener { TrackUtils.trackV2xHistoryEvent(5) hidePanel() } mV2XEventPanelHistoryCountView = V2XEventPanelHistoryCountView(context) mV2XEventPanelHistoryCountView!!.setOnClickListener { - if (clPanelContainer != null) { + if (mClPanelContainer == null) { + mClPanelContainer = mRootView.findViewById(R.id.clPanelContainer); + } + if (mClPanelContainer != null) { if (!isPanelShow()) { TrackUtils.trackV2xHistoryEvent(1) showPanel() } } } - V2XServiceManager.getMogoEntranceButtonController().addBottomLayerView(mV2XEventPanelHistoryCountView) + V2XServiceManager.getMogoEntranceButtonController() + .addBottomLayerView(mV2XEventPanelHistoryCountView) changeEventCount() } catch (e: Exception) { e.printStackTrace() @@ -151,7 +173,7 @@ class V2XEventPanelFragment : MvpFragment @@ -121,77 +121,88 @@ app:miv_shape="circle" app:miv_shapeBorderWidth="@dimen/dp_4" /> - + app:layout_constraintTop_toBottomOf="@+id/ivEventDistanceLogo"> - + - + - + - + + + + + + - \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_stub_live.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_stub_live.xml index 20bacf4ae4..dd7f9200b1 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_stub_live.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_stub_live.xml @@ -7,7 +7,7 @@ android:background="@drawable/v2x_alert_window_bg" android:gravity="center" app:roundLayoutRadius="@dimen/dp_40" - tools:layout_height="@dimen/dp_382"> + tools:layout_height="@dimen/module_v2x_event_window_height"> + android:background="@drawable/v2x_alert_window_bg"> + android:background="@drawable/v2x_alert_window_bg"> - + android:layout_height="wrap_content" + android:orientation="horizontal" + android:overScrollMode="never" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:listitem="@layout/item_v2x_live_video" /> - + - - - - + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml index 72367f3873..14f94f2268 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml @@ -15,7 +15,10 @@ android:layout_width="match_parent" android:layout_height="@dimen/dp_154" android:gravity="center_vertical" - android:orientation="horizontal"> + android:orientation="horizontal" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> + > 18px 20px - 194px + 170px 250px 190px - 130px + 122px 82px @@ -16,8 +16,8 @@ 64px - 175px - 262px + 156px + 234px 34px diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml index 812e949135..c068621299 100644 --- a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml @@ -4,19 +4,19 @@ 32px 32px - 350px + 306px 450px 390px - 220px + 210px 147px 98px 130px - 320px - 480px + 280px + 421px 60px diff --git a/modules/mogo-module-v2x/src/main/res/values/dimens.xml b/modules/mogo-module-v2x/src/main/res/values/dimens.xml index b049144d59..cec87bea7c 100644 --- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml @@ -4,11 +4,11 @@ 18px 20px - 194px + 170px 250px 190px - 130px + 122px 82px @@ -16,8 +16,8 @@ 64px - 175px - 262px + 156px + 234px 34px diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml b/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml index acfa530deb..3e51d334d1 100644 --- a/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml +++ b/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml @@ -8,7 +8,6 @@ #333333 #FFFFFF #FFFFFF - #333333 #333333 #999999 #333333