diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java index 9daf262336..94e310c67d 100644 --- a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java +++ b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java @@ -313,8 +313,6 @@ public abstract class MainMoGoApplication extends AbsMogoApplication { MogoModulePaths.addBaseModule(new MogoModule(MogoServicePaths.PATH_CHECK, "CheckProvider")); // 推送模块 MogoModulePaths.addModule(new MogoModule(PushUIConstants.PATH, PushUIConstants.NAME)); - // 碰撞报警模块 - MogoModulePaths.addBaseModule(new MogoModule(MogoServicePaths.PATH_CRASH_WARNING, "IMogoCrashWarnProvider")); // ADAS模块（旧，慢慢被 域控制器模块 替换掉） MogoModulePaths.addBaseModule(new MogoModule(MogoServicePaths.PATH_ADAS, "AdasProvider")); // 全局语音唤醒 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 27db0a7849..363aaaa7db 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 @@ -264,13 +264,6 @@ public class MogoServicePaths { @Deprecated public static final String PATH_TANLU_UI_API = "/tanlu/ui"; - /** - * 碰撞报警模块 已碰撞 - */ - @Keep - @Deprecated - public static final String PATH_CRASH_WARNING = "/crash/warning"; - /** * 在线好友面板 */ diff --git a/modules-back.txt b/modules-back.txt deleted file mode 100644 index 0e532ebad9..0000000000 --- a/modules-back.txt +++ /dev/null @@ -1,50 +0,0 @@ -:modules:mogo-module-data -:foudations:mogo-utils -:skin:mogo-skin-support -:tts:tts-base -:tts:tts-zhi -:tts:tts-pad -:libraries:mogo-map-api -:services:mogo-service-api -:foudations:mogo-aicloud-services-sdk -:foudations:mogo-commons -:tts:tts-di -:tts:tts-noop -:skin:skin-support -:skin:skin-support-appcompat -:skin:skin-support-cardview -:skin:skin-support-constraint-layout -:skin:skin-support-design -:libraries:map-autonavi -:libraries:map-custom -:libraries:mogo-map -:modules:mogo-module-common -:skin:mogo-skin-support-impl -:skin:mogo-skin-support-noop -:test:crashreport -:test:crashreport-bugly -:test:crashreport-noop -:test:crashreport-upgrade -:skin:mogo-skin-light -:modules:mogo-module-obu -:core:function-impl:mogo-core-function-obu-mogo -:modules:mogo-module-adas -:services:mogo-service -:modules:mogo-module-map -:core:function-impl:mogo-core-function-smp -:modules:mogo-module-apps -:modules:mogo-module-service -:modules:mogo-module-share -:modules:mogo-module-extensions -:modules:mogo-module-v2x -:modules:mogo-module-main -:OCH:mogo-och -:OCH:mogo-och-bus -:OCH:mogo-och-noop -:OCH:mogo-och-taxi -:modules:mogo-module-push-base -:modules:mogo-module-push-noop -:modules:mogo-module-push -:libraries:tanlulib -:modules:mogo-module-monitor -:modules:mogo-module-hmi \ No newline at end of file diff --git a/modules.txt b/modules.txt index 671cae1a82..483878ba94 100644 --- a/modules.txt +++ b/modules.txt @@ -25,7 +25,6 @@ :test:crashreport-bugly :test:crashreport-noop :test:crashreport-upgrade -:modules:mogo-module-obu :core:function-impl:mogo-core-function-obu-mogo :modules:mogo-module-adas :modules:mogo-module-service 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 40659b9208..065f264dea 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 @@ -30,7 +30,6 @@ import com.mogo.utils.glide.GlideApp import com.mogo.utils.glide.GlideRoundedCornersTransform import com.mogo.utils.logger.Logger import de.hdodenhof.circleimageview.CircleImageView -import kotlin.let as let class CallingWindowManager private constructor() : IVoiceIntentListener { 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 e97ca3ba2f..535cdf129c 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 @@ -21,10 +21,8 @@ import android.os.Handler; import android.os.SystemClock; import android.text.TextUtils; import android.util.TypedValue; -import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; -import android.view.ViewGroup; import android.widget.Button; import android.widget.EditText; import android.widget.ImageButton; @@ -46,12 +44,9 @@ import com.mogo.commons.mvp.MvpFragment; import com.mogo.commons.voice.AIAssist; import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.eagle.core.utilcode.mogo.toast.ResourcesHelper; -import com.mogo.eagle.core.utilcode.mogo.toast.TipDrawable; import com.mogo.eagle.core.utilcode.mogo.toast.TipToast; import com.mogo.map.listener.IMogoMapListener; import com.mogo.map.listener.MogoMapListenerHandler; -import com.mogo.map.location.IMogoLocationClient; -import com.mogo.map.marker.IMogoMarkerManager; import com.mogo.map.navi.IMogoAimlessModeListener; import com.mogo.map.navi.IMogoCarLocationChangedListener2; import com.mogo.map.navi.IMogoNavi; @@ -92,18 +87,14 @@ import com.mogo.service.module.IMogoRegisterCenter; import com.mogo.service.statusmanager.IMogoStatusChangedListener; import com.mogo.service.statusmanager.IMogoStatusManager; import com.mogo.service.statusmanager.StatusDescriptor; -import com.mogo.service.windowview.IMogoTopViewStatusListener; import com.mogo.utils.LaunchUtils; import com.mogo.utils.UiThreadHandler; import com.mogo.utils.glide.GlideApp; import com.mogo.utils.logger.Logger; import com.mogo.utils.storage.SharedPrefsMgr; -import com.zhidao.manager.ts.TsThreshold; import java.util.HashMap; -import java.util.Locale; import java.util.Map; -import java.util.Random; /** * @author congtaowang @@ -133,18 +124,14 @@ public class EntranceFragment extends MvpFragment { - thresholdSetContainer.setVisibility(View.GONE); - mApis.getAdasControllerApi().showADAS(); - }); mUploadRoadCondition.setOnLongClickListener(v -> { mApis.getAdasControllerApi().closeADAS(); - thresholdSetContainer.setVisibility(View.VISIBLE); - TsThreshold threshold = mApis.getCrashWarnProvider().getCurrentCrashThreshold(); - topEditC.setText(String.format(Locale.CHINA, "%d", threshold.getC5())); - topEditS.setText(String.format(Locale.CHINA, "%d", threshold.getS5())); - bottomEditC.setText(String.format(Locale.CHINA, "%d", threshold.getC6())); - bottomEditS.setText(String.format(Locale.CHINA, "%d", threshold.getS6())); - frontLeftEditC.setText(String.format(Locale.CHINA, "%d", threshold.getC4())); - frontLeftEditS.setText(String.format(Locale.CHINA, "%d", threshold.getS4())); - backLeftEditC.setText(String.format(Locale.CHINA, "%d", threshold.getC3())); - backLeftEditS.setText(String.format(Locale.CHINA, "%d", threshold.getS3())); - frontRightEditC.setText(String.format(Locale.CHINA, "%d", threshold.getC1())); - frontRightEditS.setText(String.format(Locale.CHINA, "%d", threshold.getS1())); - backRightEditC.setText(String.format(Locale.CHINA, "%d", threshold.getC2())); - backRightEditS.setText(String.format(Locale.CHINA, "%d", threshold.getS2())); return true; }); - findViewById(R.id.btnSet).setOnClickListener(view -> { - // 设置阈值 - TsThreshold threshold = new TsThreshold( - Integer.parseInt(frontRightEditC.getText().toString()), - Integer.parseInt(frontRightEditS.getText().toString()), - Integer.parseInt(backRightEditC.getText().toString()), - Integer.parseInt(backRightEditS.getText().toString()), - Integer.parseInt(backLeftEditC.getText().toString()), - Integer.parseInt(backLeftEditS.getText().toString()), - Integer.parseInt(frontLeftEditC.getText().toString()), - Integer.parseInt(frontLeftEditS.getText().toString()), - Integer.parseInt(topEditC.getText().toString()), - Integer.parseInt(topEditS.getText().toString()), - Integer.parseInt(bottomEditC.getText().toString()), - Integer.parseInt(bottomEditS.getText().toString()) - ); - mApis.getCrashWarnProvider().setCrashThreshold(threshold); - thresholdSetContainer.setVisibility(View.GONE); - mApis.getAdasControllerApi().showADAS(); - }); if (!DebugConfig.isMapBased()) { // 不基于地图的版本需要隐藏一些按钮 @@ -610,7 +512,7 @@ public class EntranceFragment extends MvpFragment 200) { showSlideMapVoiceGuide(); } @@ -660,13 +562,11 @@ public class EntranceFragment extends MvpFragment { - if (!toggle) { - TopViewAnimHelper.getInstance().showNaviView(); - } else { - TopViewAnimHelper.getInstance().hideNaviView(); - } - toggle = !toggle; - }); - - findViewById(R.id.btnDebugCtrlSubView).setOnClickListener(view -> { - View v = LayoutInflater.from(getContext()).inflate(R.layout.demo_top, null); - TextView tv = v.findViewById(R.id.tvIndex); - tv.setText("sub view height: " + currentHeight + ": " + v); - mApis.getTopViewManager().addSubView(v, new IMogoTopViewStatusListener() { - @Override - public void onViewAdded(View view) { - Logger.d(TAG, "onSubViewAdded: " + view); - } - - @Override - public void onViewRemoved(View view) { - Logger.d(TAG, "onSubViewRemoved: " + view); - } - - @Override - public void beforeViewAddAnim(View view) { - Logger.d(TAG, "beforeSubViewAddAnim: " + view); - } - - @Override - public void beforeViewRemoveAnim(View view) { - Logger.d(TAG, "beforeSubViewRemoveAnim: " + view); - } - }); - }); - - findViewById(R.id.btnDebugCtrlTopView).setOnClickListener(view -> { - View v = LayoutInflater.from(getContext()).inflate(R.layout.demo_top, null); - TextView tv = v.findViewById(R.id.tvIndex); - Random random = new Random(); - currentHeight = heights[random.nextInt(3)]; - tv.setText(" height: " + currentHeight + ": " + v); - ViewGroup.LayoutParams params = - new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, currentHeight); - // mApis.getEntranceButtonController().addLeftFeatureView(v); - - mApis.getTopViewManager().addView(v, params, new IMogoTopViewStatusListener() { - @Override - public void onViewAdded(View view) { - Logger.d(TAG, "onViewAdded: " + view); - } - - @Override - public void onViewRemoved(View view) { - Logger.d(TAG, "onViewRemoved: " + view); - } - - @Override - public void beforeViewAddAnim(View view) { - Logger.d(TAG, "beforeViewAddAnim: " + view); - } - - @Override - public void beforeViewRemoveAnim(View view) { - Logger.d(TAG, "beforeViewRemoveAnim: " + view); - } - }); - }); - - findViewById(R.id.btnDebugAddBottomLayerView).setOnClickListener(v -> { - TextView tv = new TextView(getContext()); - tv.setText("entrance add"); - mApis.getEntranceButtonController().addBottomLayerView(tv, 50, 50); - }); - findViewById(R.id.btnShowTextTip).setOnClickListener(v -> TipToast.tip("分享成功分享成功分享成功分享成功分享成功分享成功分享成功分享成功分享成功")); - - findViewById(R.id.btnShowDrawableTip).setOnClickListener(v -> { - mMsgContainer.setVisibility(View.VISIBLE); - TipDrawable drawable = - new TipDrawable(getResources().getDrawable(R.drawable.model_ext_default_user_head), 150, 150); - TipToast.tip("分享成功", drawable); - }); - - findViewById(R.id.btnShowDrawableTipNoSize).setOnClickListener(v -> { - mMsgContainer.setVisibility(View.GONE); - TipDrawable drawable = - new TipDrawable(getResources().getDrawable(R.drawable.model_ext_default_user_head)); - TipToast.tip("分享成功", drawable); - }); - } - - private boolean mLastStatusIsVr = false; - @Override public void onMapModeChanged(EnumMapUI ui) { if (mCameraMode == null) { diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/MogoEntranceButtonControllerImpl.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/MogoEntranceButtonControllerImpl.java index 6b347df729..29149a4f27 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/MogoEntranceButtonControllerImpl.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/MogoEntranceButtonControllerImpl.java @@ -5,11 +5,10 @@ import android.view.View; import android.widget.TextView; import com.alibaba.android.arouter.facade.annotation.Route; -import com.mogo.module.extensions.utils.EntranceViewHolder; import com.mogo.eagle.core.data.constants.MogoServicePaths; +import com.mogo.module.extensions.utils.EntranceViewHolder; import com.mogo.service.entrance.ButtonIndex; import com.mogo.service.entrance.IMogoEntranceButtonController; -import com.mogo.service.windowview.IMogoEntranceViewListener; /** * @author congtaowang @@ -17,17 +16,12 @@ import com.mogo.service.windowview.IMogoEntranceViewListener; *

* 描述 */ -@Route( path = MogoServicePaths.PATH_ENTRANCE_BUTTON_API ) +@Route(path = MogoServicePaths.PATH_ENTRANCE_BUTTON_API) public class MogoEntranceButtonControllerImpl implements IMogoEntranceButtonController { @Override - public TextView getButton( ButtonIndex index ) { - return MogoEntranceButtons.getButton( index ); - } - - @Override - public void addBottomLayerView(View view) { - EntranceViewHolder.getInstance().addBottomLayerView(view); + public TextView getButton(ButtonIndex index) { + return MogoEntranceButtons.getButton(index); } @Override @@ -40,15 +34,6 @@ public class MogoEntranceButtonControllerImpl implements IMogoEntranceButtonCont EntranceViewHolder.getInstance().removeBottomLayerView(view); } - @Override - public void showLeftNoticeView(View view) { - EntranceViewHolder.getInstance().showLeftNoticeView(view); - } - - @Override - public void hideLeftNoticeView(View view) { - EntranceViewHolder.getInstance().hideLeftNoticeView(view); - } @Override public void showLeftNoticeByType(int noticeType, int iconRes, String content) { @@ -61,17 +46,7 @@ public class MogoEntranceButtonControllerImpl implements IMogoEntranceButtonCont } @Override - public void addEntranceViewListener(IMogoEntranceViewListener listener) { - EntranceViewHolder.getInstance().addEntranceViewListener(listener); - } - - @Override - public void removeEntranceViewListener(IMogoEntranceViewListener listener) { - EntranceViewHolder.getInstance().removeEntranceViewListener(listener); - } - - @Override - public void init( Context context ) { + public void init(Context context) { } diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_crash_threshold_set.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_crash_threshold_set.xml deleted file mode 100644 index 1ce622b331..0000000000 --- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_crash_threshold_set.xml +++ /dev/null @@ -1,261 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -