yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opt

Browse Source
This commit is contained in:
wangcongtao
2020-05-22 15:47:49 +08:00
parent ded0e5b493
commit 5107eef2b1
7 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorPresenter.java
View File

@@ -72,10 +72,14 @@ public class AppNavigatorPresenter extends Presenter< AppNavigatorView > impleme
return;
}
try {
AppServiceHandler.getApis().getAdasControllerApi().closeADAS();
JSONObject object = new JSONObject( intent.getStringExtra( "data" ) );
String app = object.optString( "object" );
String operation = object.optString( "operation" );
if( !AppsConst.OBJECT_ADAS.equals( app ) ){
AppServiceHandler.getApis().getAdasControllerApi().closeADAS();
}
if ( AppsConst.OBJECT_ALL_APPS.equals( app ) ) {
if ( AppsConst.OPERATION_OPEN.equals( operation ) ) {
mView.openAppsPanel();

1
modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsConst.java
View File

@@ -25,6 +25,7 @@ public class AppsConst {
public static final String OBJECT_ALL_APPS = "全部应用";
public static final String OBJECT_FAST_SETTINGS = "快捷设置";
public static final String OBJECT_ADAS = "辅助驾驶";
public static final String OPERATION_OPEN = "打开";
public static final String OPERATION_CLOSE = "关闭";

6
modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsPresenter.java
View File

@@ -144,9 +144,9 @@ public class AppsPresenter extends Presenter< AppsView > {
}
}
}
growthCapacity( result );
// 添加介绍入口
result.get( result.size() - 1 ).add( new AppInfo( GuideShowLauncher.APP_INFO_NAME_GUIDE_SHOW, getContext().getPackageName(), null, 0, null, R.drawable.module_apps_ic_guide_show ) );
// growthCapacity( result );
// // 添加介绍入口
// result.get( result.size() - 1 ).add( new AppInfo( GuideShowLauncher.APP_INFO_NAME_GUIDE_SHOW, getContext().getPackageName(), null, 0, null, R.drawable.module_apps_ic_guide_show ) );
if ( DebugConfig.isDebug() ) {
// 添加测试入口
growthCapacity( result );

6
modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppEnum.java
View File

@@ -19,11 +19,11 @@ public enum AppEnum {
QQMusic( "QQ音乐", "com.pvetec.musics", R.drawable.module_apps_ic_qq_music ),
//"车聊聊",
Im( "车聊聊", "com.zhidao.imdemo", R.drawable.module_apps_ic_im ),
// Im( "车聊聊", "com.zhidao.imdemo", R.drawable.module_apps_ic_im ),
//"探路",
RoadCondition( "探路", "com.zhidao.roadcondition", R.drawable.module_apps_ic_road_condition ),
RoadConditionSlit( "探路", "com.zhidao.roadcondition.split", R.drawable.module_apps_ic_road_condition ),
// RoadCondition( "探路", "com.zhidao.roadcondition", R.drawable.module_apps_ic_road_condition ),
// RoadConditionSlit( "探路", "com.zhidao.roadcondition.split", R.drawable.module_apps_ic_road_condition ),
//"福利",
Welfare( "福利", "com.zhidaohulian.welfare.car", R.drawable.module_apps_ic_welfare ),

2
modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
View File

@@ -178,7 +178,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener,
}
// 在线车辆点击使用infoWindow
if ( TextUtils.equals( mogoMarker.getOwner(), ModuleNames.CARD_TYPE_USER_DATA ) ) {
// mogoMarker.hideInfoWindow();
mogoMarker.hideInfoWindow();
Logger.d( TAG, "关闭info window" );
} else {
Object object = mogoMarker.getObject();

5
modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/UserDataMarkerInfoWindowAdapter.java
View File

@@ -9,6 +9,7 @@ import android.widget.ImageView;
import android.widget.TextView;
import com.alibaba.android.arouter.launcher.ARouter;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.commons.network.SubscribeImpl;
import com.mogo.map.marker.IMogoInfoWindowAdapter;
import com.mogo.map.marker.IMogoMarker;
@@ -110,6 +111,10 @@ public class UserDataMarkerInfoWindowAdapter implements IMogoInfoWindowAdapter {
}
mCall.setOnClickListener( view -> {
if ( markerShowEntity.getBindObj() instanceof MarkerOnlineCar ) {
if ( DebugConfig.getNetMode() != DebugConfig.NET_MODE_DEMO ) {
callToFactUser( markerShowEntity );
return;
}
sRefreshApiService.getMockUsers().subscribeOn( Schedulers.io() )
.observeOn( AndroidSchedulers.mainThread() )
.subscribe( new SubscribeImpl< DemoUserInfoEntity >( RequestOptions.create( mContext ) ) {

2
services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
View File

@@ -36,7 +36,7 @@ public class MogoADASController implements IMogoADASController {
private static final String TAG = "MogoADASController";
public static final String ACTION = "com.zhidao.speech.awake.notify";
public static final String ACTION = "com.zhidao.autopilot.ACTION_BOOT";
public static final String PARAM_COMMAND = "command";
public static final String VAL_COMMAND = "system.application.operation";
public static final String PARAM_DATA = "data";