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 + 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"> + >