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

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

Browse Source
This commit is contained in:
wangcongtao
2021-03-18 19:50:49 +08:00
parent 237bf20c0a 8038f5467f
commit f09accadee
5 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java
View File

@@ -464,4 +464,14 @@ public class DebugConfig {
}
return result;
}
private static boolean isUseAdasRecognize = true;
public static void setUseAdasRecognize(boolean status) {
isUseAdasRecognize = status;
}
public static boolean isUseAdasRecognize(){
return isUseAdasRecognize;
}
}

2
libraries/map-custom/build.gradle
View File

@@ -67,7 +67,7 @@ dependencies {
implementation project(':foudations:mogo-commons')
}
implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.3.6'
implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.3.8'
// implementation 'com.zhidaoauto.machine:map:1.0.0-vr-test-3.4'
}

3
modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java
View File

@@ -6,6 +6,7 @@ import android.os.Message;
import android.text.TextUtils;
import com.mogo.commons.AbsMogoApplication;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.map.MogoLatLng;
import com.mogo.map.marker.IMogoMarker;
import com.mogo.map.marker.MogoMarkerOptions;
@@ -146,7 +147,7 @@ class AdasRecognizedResultDrawer extends BaseDrawer {
* @param resultList
*/
public void renderAdasRecognizedResult( List< ADASRecognizedResult > resultList ) {
if ( resultList == null || resultList.isEmpty() ) {
if ( resultList == null || resultList.isEmpty() || !DebugConfig.isUseAdasRecognize()) {
clearOldMarker();
return;
}

8
modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/VrModeNavInfoView.java
View File

@@ -12,9 +12,11 @@ import android.widget.TextView;
import androidx.constraintlayout.widget.Group;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.map.navi.MogoNaviInfo;
import com.mogo.module.extensions.R;
import com.mogo.module.extensions.view.VerticalTrafficLightView;
import com.mogo.utils.TipToast;
import static com.mogo.module.common.constants.TrafficLightConst.TRAFFIC_LIGHT_COLOR_GRAY;
@@ -61,6 +63,12 @@ public class VrModeNavInfoView extends BaseNaviInfoView implements Handler.Callb
tvDistance = findViewById(R.id.module_map_id_navi_next_info_distance_in_vr_mode);
tvDistanceUnit = findViewById(R.id.module_map_id_navi_next_info_distance_unit_in_vr_mode);
tvNextRoad = findViewById(R.id.module_map_id_navi_next_info_road_in_vr_mode);
tvCurrentSpeed.setOnLongClickListener(v -> {
DebugConfig.setUseAdasRecognize(!DebugConfig.isUseAdasRecognize());
TipToast.shortTip(DebugConfig.isUseAdasRecognize()?"Adas识别--打开":"Adas识别--关闭");
return false;
});
}
public void startNav() {

4
modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java
View File

@@ -627,6 +627,10 @@ public class MockIntentHandler implements IntentHandler {
case 52:
EnvStatusManager.getInstance().showPanel( context );
break;
case 53:
boolean isUseAdasRecognize = intent.getBooleanExtra( "status", false );
DebugConfig.setUseAdasRecognize(isUseAdasRecognize);
break;
}
}