diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/bridge/BridgeApi.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/bridge/BridgeApi.kt index c41c2ca72e..70bb059ab1 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/bridge/BridgeApi.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/bridge/BridgeApi.kt @@ -104,8 +104,6 @@ internal object BridgeApi { fun registerCenter() = apis?.registerCenterApi - fun entranceButton() = apis?.entranceButtonController - fun imageLoader() = apis?.imageLoaderApi fun windowManager() = apis?.windowManagerApi diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/fragment/V2XEventPanelFragment.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/fragment/V2XEventPanelFragment.kt index e2390fadb7..78a1c62f58 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/fragment/V2XEventPanelFragment.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/fragment/V2XEventPanelFragment.kt @@ -241,30 +241,9 @@ class V2XEventPanelFragment : MvpFragment implements IM showButton(); mySeekHelpCountDownTimerCancel(); mySeekHelpCountDownTimerStart(); - if (cancelCb == null) { - cancelCb = (command, intent) -> { - IMogoEntranceButtonController entranceButton = BridgeApi.INSTANCE.entranceButton(); - TextView tv = entranceButton != null ? entranceButton.getButton(ButtonIndex.BUTTON2) : null; - if (tv != null) { - showDialog(); - } - }; - } unregisterSeekHelpButtonCmd(); V2XVoiceManager.INSTANCE.registerWakeCmd(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_CANCEL_HELP, cancelCb); V2XVoiceManager.INSTANCE.registerUnWakeVoice(V2XVoiceConstants.COMMAND_V2X_TO_CANCEL_FOR_HELP_UN_WAKEUP, cancelCb); @@ -109,7 +96,7 @@ public class V2XCarForHelpScenario extends AbsV2XScenario implements IM if (getV2XButton() != null) { getV2XButton().setOnActionListener(this::showDialog); getV2XButton().show(); - // V2XServiceManager.getMogoEntranceButtonController().showLeftNoticeByType(IMogoEntranceButtonController.NOTICE_TYPE_SEEK_HELP, R.drawable.module_v2x_left_notice_seek_help, "正在发起求助..."); + // V2XServiceManager.getMogoEntranceButtonController().showLeftNoticeByType(IMogoEntranceButtonController.NOTICE_TYPE_SEEK_HELP, R.drawable.module_v2x_left_notice_seek_help, "正在发起求助..."); } }); } @@ -123,10 +110,6 @@ public class V2XCarForHelpScenario extends AbsV2XScenario implements IM } if (isSeekHelping) { Logger.d(TAG, "关闭自车求助按钮!"); - IMogoEntranceButtonController entranceButton = BridgeApi.INSTANCE.entranceButton(); - if (entranceButton != null) { - entranceButton.hideLeftNoticeByType(IMogoEntranceButtonController.NOTICE_TYPE_SEEK_HELP); - } statusManager.setSeekHelping(TAG, false); if (getV2XButton() != null) { getV2XButton().close(); @@ -246,33 +229,6 @@ public class V2XCarForHelpScenario extends AbsV2XScenario implements IM entity.setType(V2XMessageEntity.V2XTypeEnum.ALERT_CAR_FOR_HELP); entity.setContent(isTrue); init(entity); - } else if (descriptor == StatusDescriptor.VR_MODE) { - boolean isSeekHelping = false; - IMogoStatusManager statusManager = BridgeApi.INSTANCE.statusManager(); - if (statusManager != null) { - isSeekHelping = statusManager.isSeekHelping(); - } - if (isSeekHelping) { - if (isTrue) { - ((V2XSeekHelpButton) getV2XButton()).showTopView(); - IMogoEntranceButtonController entranceButton = BridgeApi.INSTANCE.entranceButton(); - if (entranceButton != null) { - TextView button = entranceButton.getButton(ButtonIndex.BUTTON2); - if (button != null) { - button.setVisibility(View.GONE); - } - } - } else { - ((V2XSeekHelpButton) getV2XButton()).closeTopView(); - IMogoEntranceButtonController entranceButton = BridgeApi.INSTANCE.entranceButton(); - if (entranceButton != null) { - TextView button = entranceButton.getButton(ButtonIndex.BUTTON2); - if (button != null) { - button.setVisibility(View.VISIBLE); - } - } - } - } } } } diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/help/V2XSeekHelpButton.java b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/help/V2XSeekHelpButton.java index 66941c9b0a..3469b9681a 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/help/V2XSeekHelpButton.java +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/help/V2XSeekHelpButton.java @@ -5,8 +5,8 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; -import com.mogo.eagle.core.data.BaseData; import com.mogo.commons.voice.AIAssist; +import com.mogo.eagle.core.data.BaseData; import com.mogo.eagle.core.function.v2x.R; import com.mogo.eagle.core.function.v2x.events.bridge.BridgeApi; import com.mogo.eagle.core.function.v2x.events.network.V2XRefreshCallback; @@ -17,9 +17,6 @@ import com.mogo.eagle.core.function.v2x.events.voice.V2XVoiceCallbackListener; import com.mogo.eagle.core.function.v2x.events.voice.V2XVoiceConstants; import com.mogo.eagle.core.utilcode.util.Utils; import com.mogo.module.v2x.voice.V2XVoiceManager; -import com.mogo.service.entrance.ButtonIndex; -import com.mogo.service.entrance.IMogoEntranceButtonController; -import com.mogo.service.statusmanager.IMogoStatusManager; import com.mogo.service.windowview.IMogoTopViewManager; /** @@ -57,34 +54,6 @@ public class V2XSeekHelpButton implements IV2XButton { @Override public void show() { registerVoice(); - try { - IMogoEntranceButtonController entranceButton = BridgeApi.INSTANCE.entranceButton(); - - tv = entranceButton != null ? entranceButton.getButton(ButtonIndex.BUTTON2) : null; - if (tv != null) { - tv.setText("取消\n求助"); - tv.setOnClickListener(v -> { - //调用取消求助接口 - // TODO: 2020/5/18 回调，显示对话框 - doAction(); - }); - } - boolean isVrMode = false; - IMogoStatusManager statusManager = BridgeApi.INSTANCE.statusManager(); - if (statusManager != null) { - isVrMode = statusManager.isVrMode(); - } - if (isVrMode) { - showTopView(); - tv.setVisibility(View.GONE); - } else { - closeTopView(); - tv.setVisibility(View.VISIBLE); - } - - } catch (Exception e) { - e.printStackTrace(); - } } public void showTopView() { diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XRoadEventButton.java b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XRoadEventButton.java index 6785a9ddc6..46cf61460c 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XRoadEventButton.java +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XRoadEventButton.java @@ -4,15 +4,11 @@ import android.content.Intent; import android.view.View; import android.widget.TextView; -import com.mogo.eagle.core.function.v2x.R; -import com.mogo.eagle.core.function.v2x.events.bridge.BridgeApi; import com.mogo.eagle.core.function.v2x.events.scenario.view.IV2XButton; import com.mogo.eagle.core.function.v2x.events.scenario.view.IV2XButtonListener; import com.mogo.eagle.core.function.v2x.events.voice.V2XVoiceCallbackListener; import com.mogo.eagle.core.function.v2x.events.voice.V2XVoiceConstants; import com.mogo.module.v2x.voice.V2XVoiceManager; -import com.mogo.service.entrance.ButtonIndex; -import com.mogo.service.entrance.IMogoEntranceButtonController; /** * 道路实况按钮 @@ -36,19 +32,6 @@ public class V2XRoadEventButton implements IV2XButton { public void show() { // 注册语音交互 registerVoice(); - IMogoEntranceButtonController entranceButton = BridgeApi.INSTANCE.entranceButton(); - tv = entranceButton != null ? entranceButton.getButton(ButtonIndex.BUTTON1) : null; - if (tv != null){ - tv.setText("查看\n详情"); - tv.setBackgroundResource(R.drawable.bg_v2x_event_live_show); - tv.setVisibility(View.VISIBLE); - tv.setOnClickListener(v -> { - if (mListener != null) { - mListener.onAction(); - } - close(); - }); - } } @Override diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java index 9870d74e40..d694beb0f3 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java @@ -159,13 +159,6 @@ public class MogoServicePaths { @Deprecated public static final String PATH_REFRESH_STRATEGY_API = "/refreshstrategy/api"; - /** - * 入口按钮 - */ - @Keep - @Deprecated - public static final String PATH_ENTRANCE_BUTTON_API = "/entrancebutton/api"; - /** * 顶部1/2屏管理 */ diff --git a/modules/mogo-module-carchatting/src/main/java/com/mogo/module/carchatting/view/CallingWindowManager.kt b/modules/mogo-module-carchatting/src/main/java/com/mogo/module/carchatting/view/CallingWindowManager.kt index faf4c61d68..8e012c576d 100644 --- a/modules/mogo-module-carchatting/src/main/java/com/mogo/module/carchatting/view/CallingWindowManager.kt +++ b/modules/mogo-module-carchatting/src/main/java/com/mogo/module/carchatting/view/CallingWindowManager.kt @@ -536,7 +536,6 @@ class CallingWindowManager private constructor() : IVoiceIntentListener { fun resetStatus() { isLauncherCallingViewShown = false - serviceApi?.entranceButtonController?.removeLeftFeatureView(launcherCallingView) launcherCallingView = null } diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java index daef28877c..ee44b686fb 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java @@ -50,21 +50,18 @@ import com.mogo.map.uicontroller.EnumMapUI; import com.mogo.map.uicontroller.IMogoMapUIController; import com.mogo.map.uicontroller.VisualAngleMode; import com.mogo.module.common.MogoApisHandler; -import com.mogo.module.common.dialog.WMDialog; import com.mogo.module.common.map.CustomNaviInterrupter; import com.mogo.module.common.map.MapCenterPointStrategy; import com.mogo.module.common.map.Scene; import com.mogo.module.common.view.OnPreventFastClickListener; import com.mogo.module.extensions.R; import com.mogo.module.extensions.utils.CameraLiveNoticeHelper; -import com.mogo.module.extensions.utils.EntranceViewHolder; import com.mogo.module.extensions.utils.NoMapTopViewShaderHelper; import com.mogo.module.extensions.utils.TopViewAnimHelper; import com.mogo.module.extensions.utils.TopViewNoLinkageAnimHelper; import com.mogo.service.IMogoServiceApis; import com.mogo.service.analytics.IMogoAnalytics; import com.mogo.service.cloud.socket.IMogoOnMessageListener; -import com.mogo.service.entrance.ButtonIndex; import com.mogo.service.fragmentmanager.IFragmentProvider; import com.mogo.service.fragmentmanager.IMogoFragmentManager; import com.mogo.service.intent.IMogoIntentListener; @@ -93,14 +90,8 @@ public class EntranceFragment extends MvpFragment { - mApis.getAdasControllerApi().closeADAS(); - return true; - }); - if (!DebugConfig.isMapBased()) { // 不基于地图的版本需要隐藏一些按钮 mMove2CurrentLocation.setVisibility(View.GONE); @@ -386,13 +352,6 @@ public class EntranceFragment extends MvpFragment preAddView = new ArrayList<>(); - private final List leftFeaturePreAddView = new ArrayList<>(); - private View preAddLeftNoticeView = null; - - private ViewGroup rootViewGroup = null; - private ViewGroup featureViewGroup = null; - private ViewGroup leftNoticeContainer = null; - - public void initRootViewGroup(View rootView) { - Logger.i(TAG, "initRootViewGroup=="); - if (rootView instanceof ViewGroup) { - Logger.d(TAG, "initRootViewGroup 赋值"); - rootViewGroup = (ViewGroup) rootView.getParent(); - leftNoticeContainer = - rootView.findViewById(R.id.module_ext_vr_mode_left_notice_container); - featureViewGroup = rootView.findViewById(R.id.module_entrance_id_buttons_container); - if (!preAddView.isEmpty()) { - Logger.d(TAG, "initRootViewGroup 增加底层view: " + preAddView.size()); - Iterator iterator = preAddView.iterator(); - while (iterator.hasNext()) { - BottomLayerViewWrapper wrapper = iterator.next(); - realAddView(wrapper); - iterator.remove(); - } - } - if (!leftFeaturePreAddView.isEmpty()) { - Logger.d(TAG, "initRootViewGroup 增加左下角FeatureView： " + leftFeaturePreAddView.size()); - for (View view : leftFeaturePreAddView) { - featureViewGroup.addView(view); - } - } - if (preAddLeftNoticeView != null) { - realShowLeftNoticeView(preAddLeftNoticeView); - } - } - } - - public void addBottomLayerView(View view) { - Logger.d(TAG, "addBottomLayerView, rootViewGroup is null: " + (rootViewGroup == null)); - addBottomLayerView(view, 0, 0); - } - - public void addBottomLayerView(View view, int x, int y) { - Logger.d(TAG, "addBottomLayerView, rootViewGroup is null: " + (rootViewGroup == null) + - "\n x: " + x + ", y: " + y); - BottomLayerViewWrapper wrapper = new BottomLayerViewWrapper(view, x, y); - if (rootViewGroup == null) { - if (!preAddView.contains(wrapper)) { - preAddView.add(wrapper); - } - } else { - if (!containView(view)) { - realAddView(wrapper); - } - } - } - - private boolean containView(View view) { - int count = rootViewGroup.getChildCount(); - for (int i = 0; i < count; i++) { - if (rootViewGroup.getChildAt(i).equals(view)) { - return true; - } - } - return false; - } - - private boolean containFeatureView(View view) { - int count = featureViewGroup.getChildCount(); - for (int i = 0; i < count; i++) { - if (featureViewGroup.getChildAt(i).equals(view)) { - return true; - } - } - return false; - } - - /** - * 使用的时候需要预先判断rootViewGroup是否为空，本方法默认rootViewGroup不为空 - */ - private void realAddView(BottomLayerViewWrapper wrapper) { - FrameLayout.LayoutParams params = - new FrameLayout.LayoutParams(FrameLayout.LayoutParams.WRAP_CONTENT, - FrameLayout.LayoutParams.WRAP_CONTENT); - params.topMargin = wrapper.getY(); - params.leftMargin = wrapper.getX(); - View v = wrapper.getView(); - v.setLayoutParams(params); - rootViewGroup.addView(v, 0); - // rootViewGroup.setBackgroundColor(Color.WHITE); - } - - public void removeBottomLayerView(View view) { - if (rootViewGroup != null) { - rootViewGroup.removeView(view); - } - Iterator iterator = preAddView.iterator(); - while (iterator.hasNext()) { - BottomLayerViewWrapper wrapper = iterator.next(); - if (wrapper.getView().equals(view)) { - iterator.remove(); - } - } - } - - public void addLeftFeatureView(View view) { - Logger.d(TAG, "addLeftFeatureView==" + view); - if (featureViewGroup == null) { - // 先缓存起来，等待时机加载 - if (!leftFeaturePreAddView.contains(view)) { - leftFeaturePreAddView.add(view); - } - } else { - // 直接加载 - if (!containFeatureView(view)) { - featureViewGroup.addView(view); - } - } - } - - public void removeLeftFeatureView(View view) { - if (featureViewGroup != null) { - featureViewGroup.removeView(view); - } - Iterator iterator = leftFeaturePreAddView.iterator(); - while (iterator.hasNext()) { - View wrapper = iterator.next(); - if (wrapper.equals(view)) { - iterator.remove(); - } - } - } - - - public void showLeftNoticeView(View view) { - if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) { - if (leftNoticeContainer != null) { - realShowLeftNoticeView(view); - } else { - preAddLeftNoticeView = view; - } - } - } - - public void hideLeftNoticeView(View view) { - if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) { - if (preAddLeftNoticeView != null && preAddLeftNoticeView == view) { - preAddLeftNoticeView = null; - } - if (leftNoticeContainer != null) { - realHideLeftNoticeView(view); - } - } - } - - public void forceHideNoticeView() { - for (IMogoEntranceViewListener listener : listeners) { - listener.onViewRemoved(currentShowNoticeType); - } - preAddLeftNoticeView = null; - currentShowNoticeType = 0; - if (leftNoticeContainer != null) { - leftNoticeContainer.removeAllViews(); - } - } - - private int currentShowNoticeType = 0; - - public void showLeftNoticeByType(int noticeType, int iconRes, String content) { - if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) { - if (currentShowNoticeType != noticeType && currentShowNoticeType != 0) { - for (IMogoEntranceViewListener listener : listeners) { - listener.onViewRemoved(currentShowNoticeType); - } - } - currentShowNoticeType = noticeType; - if (leftNoticeContainer != null) { - realShowLeftNoticeView(generateNoticeViewByType(noticeType, iconRes, content)); - } else { - preAddLeftNoticeView = generateNoticeViewByType(noticeType, iconRes, content); - } - } - - } - - public void hideLeftNoticeByType(int noticeType) { - if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) { - if (currentShowNoticeType == noticeType) { - forceHideNoticeView(); - } - } - } - - private View generateNoticeViewByType(int noticeType, int iconRes, String content) { - View view = - LayoutInflater.from(leftNoticeContainer.getContext()).inflate(R.layout.item_vr_left_notice, leftNoticeContainer, false); - ImageView icon = view.findViewById(R.id.module_ext_iv_left_notice_icon); - if (noticeType == NOTICE_TYPE_SEEK_HELP) { - // 自车求助，是橘色的背景 - icon.setBackgroundResource(R.drawable.module_ext_left_notice_icon_orange_bg); - } else { - // 其他是红色背景 - icon.setBackgroundResource(R.drawable.module_ext_left_notice_icon_red_bg); - } - icon.setImageResource(iconRes); - TextView tvContent = view.findViewById(R.id.module_ext_tv_left_notice_content); - tvContent.setText(content); - return view; - } - - private void realShowLeftNoticeView(View view) { - leftNoticeContainer.setVisibility(View.VISIBLE); - leftNoticeContainer.removeAllViews(); - leftNoticeContainer.addView(view); - preAddLeftNoticeView = null; - for (IMogoEntranceViewListener listener : listeners) { - listener.onViewAdded(currentShowNoticeType); - } - } - - private void realHideLeftNoticeView(View view) { - leftNoticeContainer.removeView(view); - leftNoticeContainer.setVisibility(View.GONE); - } - - private final List listeners = new ArrayList<>(); - - public void addEntranceViewListener(IMogoEntranceViewListener listener) { - listeners.add(listener); - } - - public void removeEntranceViewListener(IMogoEntranceViewListener listener) { - listeners.remove(listener); - } - - public void release() { - rootViewGroup = null; - featureViewGroup = null; - leftNoticeContainer = null; - } - -} diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml index e43f50be4f..c5b4530c0e 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml +++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml @@ -27,95 +27,6 @@ app:layout_constraintRight_toRightOf="parent" tools:ignore="SpeakableTextPresentCheck" /> - - - - - - - - - - - - - - - - - - { - }); - } - break; - case 5:// 测试左侧按钮2 - TextView button2 = MarkerServiceHandler.getApis().getEntranceButtonController().getButton(ButtonIndex.BUTTON2); - if (button2 != null) { - button2.setOnClickListener(null); - button2.setVisibility(View.GONE); - } - break; case 6:// boolean status1 = intent.getBooleanExtra("status", false); MarkerServiceHandler.getMogoStatusManager().setUploadingStatus(TAG, status1); break; - case 7:// 打开微信 - TextView button11 = MarkerServiceHandler.getApis().getEntranceButtonController().getButton(ButtonIndex.BUTTON1); - if (button11 != null) { - button11.setVisibility(View.VISIBLE); - button11.setBackgroundColor(Color.RED); - button11.setOnClickListener(view -> { - Intent intent1 = new Intent(); - intent1.setAction(Intent.ACTION_VIEW); - intent1.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - intent1.setData(Uri.parse("wechathelper://com.zhidao.wechathelper/main/transform?type=navi&lon=116.327007&lat=39.977639&from=os2.0")); - try { - view.setOnClickListener(null); - view.getContext().startActivity(intent1); - } catch (Exception e) { - e.printStackTrace(); - } - view.setVisibility(View.GONE); - }); - } - break; case 8:// 测试修改车头角度 float bearing = intent.getFloatExtra("bearing", 0); MarkerServiceHandler.getMapUIController().changeBearing(bearing); diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java b/services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java index ba17ce6c05..09c334b653 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java @@ -11,7 +11,6 @@ import com.mogo.service.cloud.passport.IMogoPassportManager; import com.mogo.service.cloud.socket.IMogoSocketManager; import com.mogo.service.cloud.socket.IMogoWebSocketManager; import com.mogo.service.datamanager.IMogoDataManager; -import com.mogo.service.entrance.IMogoEntranceButtonController; import com.mogo.service.eventpanel.IEventPanelProvider; import com.mogo.service.fragmentmanager.IMogoFragmentManager; import com.mogo.service.imageloader.IMogoImageloader; @@ -22,7 +21,6 @@ import com.mogo.service.module.IMogoActionManager; import com.mogo.service.module.IMogoMarkerService; import com.mogo.service.module.IMogoRegisterCenter; import com.mogo.service.network.IMogoNetwork; -import com.mogo.service.obu.IMogoCrashWarnProvider; import com.mogo.service.share.IMogoShareManager; import com.mogo.service.share.IMogoTanluProvider; import com.mogo.service.share.IMogoTanluUiProvider; @@ -161,13 +159,6 @@ public interface IMogoServiceApis extends IProvider { IMogoRefreshStrategyController getRefreshStrategyControllerApi(); - /** - * 获取入口按钮控制器 - * - * @return - */ - IMogoEntranceButtonController getEntranceButtonController(); - /** * 获取顶部1/2屏界面管理类 * diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/entrance/ButtonIndex.java b/services/mogo-service-api/src/main/java/com/mogo/service/entrance/ButtonIndex.java deleted file mode 100644 index 1c4e955019..0000000000 --- a/services/mogo-service-api/src/main/java/com/mogo/service/entrance/ButtonIndex.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.mogo.service.entrance; - -/** - * @author congtaowang - * @since 2020-04-16 - *

- * 入口按钮顺序：从上到下 - */ -public enum ButtonIndex { - - /** - * 第一个 - */ - BUTTON1, - - /** - * 第二个 - */ - BUTTON2; -} diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/entrance/IMogoEntranceButtonController.java b/services/mogo-service-api/src/main/java/com/mogo/service/entrance/IMogoEntranceButtonController.java deleted file mode 100644 index 0eb8f39cf1..0000000000 --- a/services/mogo-service-api/src/main/java/com/mogo/service/entrance/IMogoEntranceButtonController.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.mogo.service.entrance; - -import android.view.View; -import android.widget.TextView; - -import com.alibaba.android.arouter.facade.template.IProvider; - -/** - * @author congtaowang - * @since 2020-04-16 - *

- * 入口按钮 - */ -public interface IMogoEntranceButtonController extends IProvider { - /** - * 自车求助 - */ - int NOTICE_TYPE_SEEK_HELP = 1007; - - /** - * 获取入口按钮实例 - * - * @param index - * @return - */ - TextView getButton(ButtonIndex index); - - /** - * 添加低层级view，使用ViewGroup.addView(v,0)实现 - * 可指定x,y位置 - * - * @param view 将要添加的view - * @param x leftMargin - * @param y topMargin - */ - void addBottomLayerView(View view, int x, int y); - - /** - * 移除对应的底层view - * - * @param view 待移除view - */ - void removeBottomLayerView(View view); - - /** - * 添加左下角功能View，按顺序添加到最底端 - * - * @param view 待添加view - */ - void addLeftFeatureView(View view); - - /** - * 移除左下角功能按钮 - * - * @param view 待移除view - */ - void removeLeftFeatureView(View view); - - /** - * 根据noticeType添加左侧提示 - * - * @param noticeType {@link #NOTICE_TYPE_SEEK_HELP}... - * @param iconRes 本地 icon res - * @param content 提示内容 - */ - void showLeftNoticeByType(int noticeType, int iconRes, String content); - - /** - * 移除noticeType，需要与{@link #showLeftNoticeByType(int, int, String)}成对使用 - * - * @param noticeType {@link #NOTICE_TYPE_SEEK_HELP}... - */ - void hideLeftNoticeByType(int noticeType); - -} diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java b/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java index dfd6674c67..32332fbff4 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java @@ -16,7 +16,6 @@ import com.mogo.service.cloud.passport.IMogoPassportManager; import com.mogo.service.cloud.socket.IMogoSocketManager; import com.mogo.service.cloud.socket.IMogoWebSocketManager; import com.mogo.service.datamanager.IMogoDataManager; -import com.mogo.service.entrance.IMogoEntranceButtonController; import com.mogo.service.eventpanel.IEventPanelProvider; import com.mogo.service.fragmentmanager.IMogoFragmentManager; import com.mogo.service.imageloader.IMogoImageloader; @@ -149,11 +148,6 @@ public class MogoServiceApis implements IMogoServiceApis { return getApiInstance(IMogoRefreshStrategyController.class, MogoServicePaths.PATH_REFRESH_STRATEGY_API); } - @Override - public IMogoEntranceButtonController getEntranceButtonController() { - return getApiInstance(IMogoEntranceButtonController.class, MogoServicePaths.PATH_ENTRANCE_BUTTON_API); - } - @Override public IMogoTopViewManager getTopViewManager() { return getApiInstance(IMogoTopViewManager.class, MogoServicePaths.PATH_EXTENSIONS_TOP_VIEW_MANAGER);