diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index dd543deb69..8b0cecd1c8 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -45,7 +45,6 @@
-
diff --git a/app/build.gradle b/app/build.gradle
index 1dd61be66d..fbe5b0af7a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -190,7 +190,6 @@ dependencies {
implementation project(':foudations:mogo-aicloud-services-sdk')
implementation project(':foudations:mogo-commons')
implementation project(':modules:mogo-module-common')
- implementation project(':modules:mogo-module-authorize')
implementation project(':modules:mogo-module-service')
implementation project(':modules:mogo-module-v2x')
implementation project(':modules:mogo-module-share')
diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java
index 24b6bc4104..834d383701 100644
--- a/app/src/main/java/com/mogo/launcher/MogoApplication.java
+++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java
@@ -14,14 +14,13 @@ import com.mogo.cloud.passport.IMoGoTokenCallback;
import com.mogo.cloud.passport.MoGoAiCloudClient;
import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
import com.mogo.commons.AbsMogoApplication;
-import com.mogo.eagle.core.data.config.FunctionBuildConfig;
import com.mogo.commons.constants.SharedPrefsConstants;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.commons.network.Utils;
+import com.mogo.eagle.core.data.config.FunctionBuildConfig;
import com.mogo.eagle.core.data.constants.MogoServicePaths;
import com.mogo.map.MapApiPath;
import com.mogo.map.location.MogoLocation;
-import com.mogo.module.authorize.authprovider.invoke.AuthorizeConstant;
import com.mogo.module.carchatting.card.CallChatConstant;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.module.common.MogoModule;
@@ -263,8 +262,6 @@ public class MogoApplication extends AbsMogoApplication {
private void initModules() {
Logger.d(TAG, "initModules");
- MogoModulePaths.addModule(new MogoModule(MogoServicePaths.PATH_AGREEMENT, AuthorizeConstant.PATH_AGREEMENT_MODULE_NAME));
-
if (DebugConfig.isLauncher()) {
MogoModulePaths.addModule(new MogoModule(MogoServicePaths.PATH_BACK, MogoServicePaths.PATH_BACK));
}
diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasObjectUtils.kt b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasObjectUtils.kt
index 32302a6663..d552e1833f 100644
--- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasObjectUtils.kt
+++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasObjectUtils.kt
@@ -98,7 +98,7 @@ object AdasObjectUtils {
result.distance = model.distance
result.threatLevel = model.drawlevel
- Log.d(TAG, "TrafficData = $result")
+ //Log.d(TAG, "TrafficData = $result")
return result
}
diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
index 8e95779ddb..0751425b3c 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
@@ -170,9 +170,6 @@ public class MainActivity extends MvpActivity implement
mServiceApis.getStatusManagerApi().registerStatusChangedListener(TAG, StatusDescriptor.VR_MODE, this);
mPresenter.checkPermission(this);
-
- //TODO 启动检测页面,这里后面考虑做成Fragment
- //MogoApisHandler.getInstance().getApis().getCheckProvider().startCheckActivity(this);
}
private void init() {
@@ -180,7 +177,6 @@ public class MainActivity extends MvpActivity implement
mServiceApis = MogoApisHandler.getInstance().getApis();
}
mServiceApis.getShareManager().resetContext(this);
- mServiceApis.getAuthManagerApi().showAuth(this);
mMogoStatusManager = mServiceApis.getStatusManagerApi();
mMogoStatusManager.setMainPageLaunchedStatus(TAG, true);
@@ -288,11 +284,6 @@ public class MainActivity extends MvpActivity implement
mServiceApis.getAdasControllerApi().showADAS();
}
- @Override
- public void loadCardModules() {
- List providers = MogoModulesManager.getInstance().loadCardsModule();
- }
-
@NonNull
@Override
protected MainPresenter createPresenter() {
@@ -331,7 +322,6 @@ public class MainActivity extends MvpActivity implement
protected void onPause() {
super.onPause();
mMogoStatusManager.setMainPageResumeStatus(TAG, false);
- mServiceApis.getAuthManagerApi().dismiss();
if (shouldCloseADASPanelWhenPause()) {
mServiceApis.getAdasControllerApi().closeADAS();
}
diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainPresenter.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainPresenter.java
index 080de7c32b..6e8b37824e 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainPresenter.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainPresenter.java
@@ -30,9 +30,6 @@ public class MainPresenter extends Presenter< MainView > {
public void handleMessage( Message msg ) {
super.handleMessage( msg );
switch ( msg.what ) {
- case MainConstants.MSG_LOAD_CARD_MODULES:
- mView.loadCardModules();
- break;
case MainConstants.MSG_HIDE_MAP_COVER_FRAME:
mView.hideCoverUpLayout();
break;
@@ -99,7 +96,6 @@ public class MainPresenter extends Presenter< MainView > {
* 延时操作
*/
public void delayOperations() {
- mMsgHandler.sendEmptyMessageDelayed( MainConstants.MSG_LOAD_CARD_MODULES, 100L );
mMsgHandler.sendEmptyMessageDelayed( MainConstants.MSG_HIDE_MAP_COVER_FRAME, 150L );
}
diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainView.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainView.java
index 054812e994..e2555d5f8c 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainView.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainView.java
@@ -11,11 +11,6 @@ import com.mogo.service.IMogoServiceApis;
*/
public interface MainView extends IView {
- /**
- * 加载卡片
- */
- void loadCardModules();
-
/**
* 隐藏背景
*/
diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesHandler.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesHandler.java
index c48de48d45..0c6aeac7b3 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesHandler.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesHandler.java
@@ -17,13 +17,6 @@ public interface MogoModulesHandler {
*/
void loadModules();
- /**
- * 加载卡片
- *
- * @return
- */
- List loadCardsModule();
-
/**
* 架构升级v1.1加载功能模块
*/
diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java
index 602920c58d..2d020cca37 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java
@@ -100,18 +100,6 @@ public class MogoModulesManager implements MogoModulesHandler {
}
}
- @Override
- public List< IMogoModuleProvider > loadCardsModule() {
-
- final List< MogoModule > modules = MogoModulePaths.getModules();
- final ArrayList< IMogoModuleProvider > providers = new ArrayList<>();
- for ( MogoModule module : modules ) {
- IMogoModuleProvider provider = mModuleProviders.get( module );
- providers.add( provider );
- }
- return providers;
- }
-
@Override
public void loadFunctionModules() {
final List< MogoModule > modules = MogoModulePaths.getModuleFunctions();
diff --git a/modules/mogo-module-share/build.gradle b/modules/mogo-module-share/build.gradle
index 03b2aa4bf9..b7abc34950 100644
--- a/modules/mogo-module-share/build.gradle
+++ b/modules/mogo-module-share/build.gradle
@@ -64,7 +64,6 @@ dependencies {
implementation project(":foudations:mogo-utils")
implementation project(":foudations:mogo-commons")
implementation project(':modules:mogo-module-common')
- implementation project(':modules:mogo-module-authorize')
implementation project(':modules:mogo-module-service')
implementation project(':core:mogo-core-data')
diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java
index 8323d3a999..f4f05d1ccc 100644
--- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java
@@ -1,57 +1,6 @@
package com.mogo.module.share;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.os.Handler;
-import android.os.Message;
-import android.util.ArrayMap;
-
-import com.alibaba.android.arouter.facade.annotation.Route;
-import com.alibaba.android.arouter.launcher.ARouter;
-import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
-import com.mogo.commons.network.SubscribeImpl;
-import com.mogo.map.location.MogoLocation;
-import com.mogo.module.authorize.authprovider.invoke.AuthorizeConstant;
-import com.mogo.module.authorize.authprovider.invoke.AuthorizeInvokerConstant;
-import com.mogo.module.authorize.authprovider.module.IMogoAcquireAuthorizeListener;
-import com.mogo.module.authorize.authprovider.module.IMogoAuthorizeModuleManager;
-import com.mogo.module.common.constants.HostConst;
-import com.mogo.module.common.dialog.BaseFloatDialog;
-import com.mogo.module.common.utils.CloudPoiManager;
-import com.mogo.module.share.bean.FixableButton;
-import com.mogo.module.share.bean.ShareButtonConfigResponse;
-import com.mogo.module.share.bean.ShareConfigRequest;
-import com.mogo.module.share.bean.StepAfterAuth;
-import com.mogo.module.share.constant.ShareConstants;
-import com.mogo.module.share.dialog.GridFixableShareDialog;
-import com.mogo.module.share.manager.ServiceApisManager;
-import com.mogo.module.share.manager.UploadHelper;
-import com.mogo.module.share.net.ShareDevaApiService;
-import com.mogo.eagle.core.data.constants.MogoServicePaths;
-import com.mogo.service.share.IMogoShareManager;
-import com.mogo.service.share.IMogoTanluProvider;
-import com.mogo.service.share.TanluUploadParams;
-import com.mogo.service.statusmanager.IMogoStatusChangedListener;
-import com.mogo.service.statusmanager.StatusDescriptor;
-import com.mogo.utils.NetworkUtils;
-import com.mogo.utils.TipToast;
-import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.RequestOptions;
-import com.mogo.utils.network.utils.GsonUtil;
-import com.mogo.utils.storage.SharedPrefsMgr;
-
-import org.jetbrains.annotations.NotNull;
-import org.json.JSONObject;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import io.reactivex.schedulers.Schedulers;
-
import static com.mogo.module.share.bean.StepAfterAuthKt.STEP_AFTER_AUTH_TYPE_SEEK_HELP;
-import static com.mogo.module.share.bean.StepAfterAuthKt.STEP_AFTER_AUTH_TYPE_SHOW_DIALOG;
import static com.mogo.module.share.bean.StepAfterAuthKt.STEP_AFTER_AUTH_TYPE_UPLOAD;
import static com.mogo.module.share.constant.ShareConstants.KEY_SHARE_CONFIG;
import static com.mogo.module.share.constant.ShareConstants.UNWAKE_CANCEL_SHARE;
@@ -81,6 +30,49 @@ import static com.mogo.service.share.IMogoTanluProvider.TYPE_ROAD_ICY;
import static com.mogo.service.share.IMogoTanluProvider.TYPE_STAGNANT_WATER;
import static com.mogo.service.share.IMogoTanluProvider.TYPE_TRAFFIC_CHECK;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.os.Handler;
+import android.os.Message;
+import android.util.ArrayMap;
+
+import com.alibaba.android.arouter.facade.annotation.Route;
+import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
+import com.mogo.commons.network.SubscribeImpl;
+import com.mogo.eagle.core.data.constants.MogoServicePaths;
+import com.mogo.map.location.MogoLocation;
+import com.mogo.module.common.constants.HostConst;
+import com.mogo.module.common.dialog.BaseFloatDialog;
+import com.mogo.module.common.utils.CloudPoiManager;
+import com.mogo.module.share.bean.FixableButton;
+import com.mogo.module.share.bean.ShareButtonConfigResponse;
+import com.mogo.module.share.bean.ShareConfigRequest;
+import com.mogo.module.share.bean.StepAfterAuth;
+import com.mogo.module.share.constant.ShareConstants;
+import com.mogo.module.share.dialog.GridFixableShareDialog;
+import com.mogo.module.share.manager.ServiceApisManager;
+import com.mogo.module.share.manager.UploadHelper;
+import com.mogo.module.share.net.ShareDevaApiService;
+import com.mogo.service.share.IMogoShareManager;
+import com.mogo.service.share.IMogoTanluProvider;
+import com.mogo.service.share.TanluUploadParams;
+import com.mogo.service.statusmanager.IMogoStatusChangedListener;
+import com.mogo.service.statusmanager.StatusDescriptor;
+import com.mogo.utils.NetworkUtils;
+import com.mogo.utils.logger.Logger;
+import com.mogo.utils.network.RequestOptions;
+import com.mogo.utils.network.utils.GsonUtil;
+import com.mogo.utils.storage.SharedPrefsMgr;
+
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import io.reactivex.schedulers.Schedulers;
+
/**
* 分享框的逻辑都放到这里吧
*
@@ -99,15 +91,9 @@ public class ShareControl implements IMogoShareManager, Handler.Callback {
private BaseFloatDialog mShareDialog;
- private IMogoAuthorizeModuleManager authorizeModuleManager;
-
@Override
public void showShareDialog() {
- if (authorizeModuleManager.needAuthorize(AuthorizeInvokerConstant.AUTHORIZE_TYPE_LAUNCHER_SHARE)) {
- authorizeModuleManager.invokeAuthorization(AuthorizeInvokerConstant.AUTHORIZE_TYPE_LAUNCHER_SHARE);
- } else {
- realShowDialog();
- }
+ realShowDialog();
}
@Override
@@ -131,11 +117,7 @@ public class ShareControl implements IMogoShareManager, Handler.Callback {
private void realShowDialog() {
if (mShareDialog == null) {
Logger.d(TAG, "realShowDialog context : " + mContext);
-// if(DebugConfig.isLauncher()){
-// mShareDialog = new LaucherShareDialog(mContext);
-// }else {
mShareDialog = new GridFixableShareDialog(mContext);
-// }
mShareDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
@Override
public void onDismiss(DialogInterface dialog) {
@@ -153,43 +135,7 @@ public class ShareControl implements IMogoShareManager, Handler.Callback {
Logger.d(TAG, "start init====");
mContext = context;
ServiceApisManager.INSTANCE.init(context);
- authorizeModuleManager =
- (IMogoAuthorizeModuleManager) ARouter.getInstance().build(AuthorizeConstant.PROVIDER_MODULE).navigation(context);
- authorizeModuleManager.registerAuthorizeListener(AuthorizeInvokerConstant.AUTHORIZE_TYPE_LAUNCHER_SHARE, new IMogoAcquireAuthorizeListener() {
- @Override
- public void authorizeSuccess() {
- switch (stepAfterAuth.getType()) {
- case STEP_AFTER_AUTH_TYPE_SHOW_DIALOG:
- realShowDialog();
- break;
- case STEP_AFTER_AUTH_TYPE_UPLOAD:
- TanluUploadParams params =
- new TanluUploadParams(stepAfterAuth.getUploadType(),
- IMogoTanluProvider.UPLOAD_FROM_VOICE);
- UploadHelper.INSTANCE.upload(mContext, params,
- stepAfterAuth.getForcePlayVoice());
- dismissShareDialog();
- break;
- case STEP_AFTER_AUTH_TYPE_SEEK_HELP:
- seekHelp();
- dismissShareDialog();
- break;
- default:
- break;
- }
- }
- @Override
- public void authorizeFailed(@NotNull String errorMsg) {
- TipToast.tip("未授权,无法分享");
- }
-
- @Override
- public void forbiddenVoiceWhenAuthorize(@NotNull String cmd) {
- TipToast.tip("未授权,无法分享");
- }
- });
-// if (!DebugConfig.isLauncher()) {
ServiceApisManager.serviceApis.getStatusManagerApi().registerStatusChangedListener(TAG,
StatusDescriptor.MAIN_PAGE_RESUME, new IMogoStatusChangedListener() {
@Override
@@ -199,9 +145,6 @@ public class ShareControl implements IMogoShareManager, Handler.Callback {
}
}
});
-// }
-
-// if (!DebugConfig.isLauncher()) {
ServiceApisManager.serviceApis.getStatusManagerApi().registerStatusChangedListener(TAG,
StatusDescriptor.ACC_STATUS, new IMogoStatusChangedListener() {
@Override
@@ -212,11 +155,9 @@ public class ShareControl implements IMogoShareManager, Handler.Callback {
}
}
});
-
// 获取分享框配置信息
queryShareConfigRetryTime = 0;
queryShareButtonConfig();
-// }
Logger.d(TAG, "init over====");
}
@@ -435,14 +376,13 @@ public class ShareControl implements IMogoShareManager, Handler.Callback {
}
private boolean needAuth() {
- return authorizeModuleManager.needAuthorize(AuthorizeInvokerConstant.AUTHORIZE_TYPE_LAUNCHER_SHARE);
+ return false;
}
private void goAuth(int type, String uploadType, boolean forcePlayVoice) {
stepAfterAuth.setType(type);
stepAfterAuth.setUploadType(uploadType);
stepAfterAuth.setForcePlayVoice(forcePlayVoice);
- authorizeModuleManager.invokeAuthorization(AuthorizeInvokerConstant.AUTHORIZE_TYPE_LAUNCHER_SHARE);
}
private void queryShareButtonConfig() {
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 51f5b38be2..747fa4c934 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
@@ -6,7 +6,6 @@ import com.alibaba.android.arouter.facade.template.IProvider;
import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWaringProvider;
import com.mogo.service.adas.IMogoADASController;
import com.mogo.service.analytics.IMogoAnalytics;
-import com.mogo.service.auth.IMogoAuthManager;
import com.mogo.service.cardmanager.IMogoCardManager;
import com.mogo.service.cloud.location.IMogoLocationInfoService;
import com.mogo.service.cloud.passport.IMogoPassportManager;
@@ -24,8 +23,6 @@ import com.mogo.service.map.IMogoMapService;
import com.mogo.service.module.IMogoActionManager;
import com.mogo.service.module.IMogoMarkerService;
import com.mogo.service.module.IMogoRegisterCenter;
-import com.mogo.service.module.IMogoSearchManager;
-import com.mogo.service.module.IMogoSettingManager;
import com.mogo.service.monitor.IMogoMonitorProvider;
import com.mogo.service.network.IMogoNetwork;
import com.mogo.service.obu.IMogoCrashWarnProvider;
@@ -232,12 +229,6 @@ public interface IMogoServiceApis extends IProvider {
*/
IMogoPassportManager getPassportManagerApi();
- /**
- * 获取授权服务
- *
- * @return
- */
- IMogoAuthManager getAuthManagerApi();
/**
* 获取探路服务
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 485fe630d4..5469047ebc 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
@@ -5,12 +5,11 @@ import android.content.Context;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.alibaba.android.arouter.facade.template.IProvider;
import com.alibaba.android.arouter.launcher.ARouter;
+import com.mogo.eagle.core.data.constants.MogoServicePaths;
import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWaringProvider;
import com.mogo.service.IMogoServiceApis;
-import com.mogo.eagle.core.data.constants.MogoServicePaths;
import com.mogo.service.adas.IMogoADASController;
import com.mogo.service.analytics.IMogoAnalytics;
-import com.mogo.service.auth.IMogoAuthManager;
import com.mogo.service.cardmanager.IMogoCardManager;
import com.mogo.service.cloud.location.IMogoLocationInfoService;
import com.mogo.service.cloud.passport.IMogoPassportManager;
@@ -32,8 +31,6 @@ import com.mogo.service.map.IMogoMapService;
import com.mogo.service.module.IMogoActionManager;
import com.mogo.service.module.IMogoMarkerService;
import com.mogo.service.module.IMogoRegisterCenter;
-import com.mogo.service.module.IMogoSearchManager;
-import com.mogo.service.module.IMogoSettingManager;
import com.mogo.service.monitor.IMogoMonitorProvider;
import com.mogo.service.network.IMogoNetwork;
import com.mogo.service.obu.IMogoCrashWarnProvider;
@@ -202,10 +199,6 @@ public class MogoServiceApis implements IMogoServiceApis {
return getApiInstance(IMogoPassportManager.class, MogoServicePaths.PATH_PASSPORT);
}
- @Override
- public IMogoAuthManager getAuthManagerApi() {
- return getApiInstance(IMogoAuthManager.class, MogoServicePaths.PATH_AGREEMENT);
- }
@Override
public IMogoTanluProvider getTanluApi() {
diff --git a/settings.gradle b/settings.gradle
index f778afe314..4f35b89719 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -64,7 +64,6 @@ include ':modules:mogo-module-main'
include ':modules:mogo-module-share'
include ':modules:mogo-module-service'
include ':modules:mogo-module-back'
-include ':modules:mogo-module-authorize'
include ':modules:mogo-module-apps'
include ':modules:mogo-module-extensions'
include ':modules:mogo-module-v2x'