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

modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XEventPanelModuleProvider.java

@@ -13,6 +13,7 @@ import com.mogo.map.location.IMogoLocationListener;
 import com.mogo.map.marker.IMogoMarkerClickListener;
 import com.mogo.map.navi.IMogoNaviListener;
 import com.mogo.module.v2x.fragment.V2XEventPanelFragment;
+import com.mogo.service.eventpanel.IEventPanelProvider;
 import com.mogo.service.module.IMogoModuleLifecycle;
 import com.mogo.service.module.IMogoModuleProvider;
 import com.mogo.service.module.ModuleType;
@@ -29,7 +30,7 @@ import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
  */
 @Route(path = V2XConst.PATH_EVENT_PANEL)
 public class V2XEventPanelModuleProvider implements
-        IMogoModuleProvider {
+        IEventPanelProvider {
     private final String TAG = "EventPanelModuleProvider";
 
     @Override
@@ -93,4 +94,9 @@ public class V2XEventPanelModuleProvider implements
     public void init(Context context) {
         Logger.e(MODULE_NAME, "事件模版 模块初始化。。。。");
     }
+
+    @Override
+    public void showPanelWithSelectedItem(int item) {
+        V2XEventPanelFragment.Companion.getInstance().showPanelWithSelectedItem(item);
+    }
 }

modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java

@@ -21,6 +21,7 @@ import com.mogo.service.adas.IMogoADASController;
 import com.mogo.service.analytics.IMogoAnalytics;
 import com.mogo.service.connection.IMogoSocketManager;
 import com.mogo.service.entrance.IMogoEntranceButtonController;
+import com.mogo.service.eventpanel.IEventPanelProvider;
 import com.mogo.service.imageloader.IMogoImageloader;
 import com.mogo.service.intent.IMogoIntentManager;
 import com.mogo.service.map.IMogoMapService;
@@ -71,6 +72,8 @@ public class V2XServiceManager {
     private static IMogoMarkerService mIMogoMarkerService;
     private static IMogoShareManager mIMogoShareManager;
     private static IMogoTanluProvider mIMogoTanluProvider;
+    //事件面板
+    private static IEventPanelProvider mIEventPanelProvider;
 
     private static IMogoActionManager mMogoActionManager;
     private static ICarsChattingProvider mCarsChattingProvider;
@@ -92,6 +95,8 @@ public class V2XServiceManager {
     private static IMoGoV2XStatusManager moGoV2XStatusManager;
 
 
+
+
     public static void init(final Context context) {
         if (!isInit) {
             isInit = true;
@@ -116,6 +121,8 @@ public class V2XServiceManager {
             mIMogoShareManager = mMogoServiceApis.getShareManager();
             mIMogoTanluProvider = mMogoServiceApis.getTanluApi();
             mMogoOnlineCarListPanelProvider = mMogoServiceApis.getOnlineCarPanelApi();
+            //事件面板
+            mIEventPanelProvider  = mMogoServiceApis.getEventPanelManager();
 
             mMarkerManager = mMapService.getMarkerManager(context);
             mNavi = mMapService.getNavi(context);
@@ -271,4 +278,8 @@ public class V2XServiceManager {
     public static IMogoOnlineCarListPanelProvider getMogoOnlineCarListPanelProvider() {
         return mMogoOnlineCarListPanelProvider;
     }
+
+    public static IEventPanelProvider getEventPanelProvider(){
+        return mIEventPanelProvider;
+    }
 }

modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt

@@ -22,6 +22,7 @@ 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.service.eventpanel.IEventPanelProvider
 import com.mogo.utils.logger.Logger
 
 
@@ -203,6 +204,16 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
         return EventPanelPresenter(this)
     }
 
+
+    public fun showPanelWithSelectedItem(item: Int) {
+        showPanel()
+        mRbScenarioHistory?.typeface = Typeface.defaultFromStyle(Typeface.NORMAL)
+        mRbSurroundingEvent?.typeface = Typeface.defaultFromStyle(Typeface.NORMAL)
+        mRbShareEvents?.typeface = Typeface.defaultFromStyle(Typeface.BOLD)
+
+        mVpEventPanel?.setCurrentItem(item, false)
+    }
+
     fun showPanel() {
         Logger.d(MODULE_NAME, "in fragment show panel")
         mClPanelContainer?.visibility = View.VISIBLE