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

add lat lon in test panel

Browse Source
This commit is contained in:
zhongchao
2021-04-26 15:07:56 +08:00
parent cc08ef6a14
commit 2b3a7c2928
4 changed files with 543 additions and 530 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
modules/mogo-module-common/src/main/java/com/mogo/module/common/uploadintime/SnapshotLocationController.java
View File

@@ -11,12 +11,12 @@ import java.util.ArrayList;
import java.util.List;
public
/*
* @author congtaowang
* @since 2020/12/14
*
* 实时坐标数据处理中心
*/
/*
* @author congtaowang
* @since 2020/12/14
*
* 实时坐标数据处理中心
*/
class SnapshotLocationController {
private static final String TAG = "SnapshotLocationController";
@@ -27,9 +27,9 @@ class SnapshotLocationController {
}
public static SnapshotLocationController getInstance() {
if ( sInstance == null ) {
synchronized ( SnapshotLocationController.class ) {
if ( sInstance == null ) {
if (sInstance == null) {
synchronized (SnapshotLocationController.class) {
if (sInstance == null) {
sInstance = new SnapshotLocationController();
}
}
@@ -44,10 +44,10 @@ class SnapshotLocationController {
private CloudLocationInfo mLastLocationInfo = null;
// GPS(1s1次) RTK(OS侧)缓存数据，
private final List< CloudLocationInfo > mLocationList = new ArrayList<>();
private final List<CloudLocationInfo> mLocationList = new ArrayList<>();
// adda 工控机数据缓存
private final List< CloudLocationInfo > mMachineCacheList = new ArrayList<>();
private final List<CloudLocationInfo> mMachineCacheList = new ArrayList<>();
private int mDataAccuracy = 0;
private double mCurSpeed;
@@ -59,15 +59,15 @@ class SnapshotLocationController {
*
* @param cli {@link CloudLocationInfo}
*/
public void syncLocationInfo( CloudLocationInfo cli ) {
if ( cli == null ) {
public void syncLocationInfo(CloudLocationInfo cli) {
if (cli == null) {
return;
}
mLastLocationInfo = cli;
mCurSpeed = cli.getSpeed();
mCurLon = cli.getLon();
mCurLat = cli.getLat();
mLocationList.add( cli );
mLocationList.add(cli);
}
/**
@@ -75,33 +75,39 @@ class SnapshotLocationController {
*
* @param data JSON结构化数据
*/
public void syncAdasLocationInfo( JSONObject data ) {
if ( data == null ) {
public void syncAdasLocationInfo(JSONObject data) {
if (data == null) {
return;
}
DebugConfig.setStatus( DebugConfig.sLocation, true );
Logger.d( TAG, "同步到rtk数据" );
double lon = data.optDouble( "lon", -1 );
double lat = data.optDouble( "lat", -1 );
double alt = data.optDouble( "alt", -1 );
double heading = data.optDouble( "heading", -1 );
double acceleration = data.optDouble( "acceleration", -1 );
double yawRate = data.optDouble( "yawRate", -1 );
double speed = data.optDouble( "speed", -1 );
long satelliteTime = data.optLong( "satelliteTime" );
long systemTime = data.optLong( "systemTime" );
//测试面板状态同步
DebugConfig.setStatus(DebugConfig.sLocation, true);
Logger.d(TAG, "同步到rtk数据");
double lon = data.optDouble("lon", -1);
double lat = data.optDouble("lat", -1);
double alt = data.optDouble("alt", -1);
double heading = data.optDouble("heading", -1);
double acceleration = data.optDouble("acceleration", -1);
double yawRate = data.optDouble("yawRate", -1);
double speed = data.optDouble("speed", -1);
long satelliteTime = data.optLong("satelliteTime");
long systemTime = data.optLong("systemTime");
//测试面板状态同步
DebugConfig.setStatusData(DebugConfig.sLon, lon);
DebugConfig.setStatusData(DebugConfig.sLat, lat);
CloudLocationInfo cloudLocationInfo = new CloudLocationInfo();
cloudLocationInfo.setAlt( alt );
cloudLocationInfo.setHeading( heading );
cloudLocationInfo.setLat( lat );
cloudLocationInfo.setLon( lon );
cloudLocationInfo.setSpeed( speed );
cloudLocationInfo.setSatelliteTime( satelliteTime );
cloudLocationInfo.setSystemTime( systemTime );
cloudLocationInfo.setTileId(String.valueOf(MogoApisHandler.getInstance().getApis().getMapServiceApi().getMapUIController().getTileId(lon,lat)));
cloudLocationInfo.setAlt(alt);
cloudLocationInfo.setHeading(heading);
cloudLocationInfo.setLat(lat);
cloudLocationInfo.setLon(lon);
cloudLocationInfo.setSpeed(speed);
cloudLocationInfo.setSatelliteTime(satelliteTime);
cloudLocationInfo.setSystemTime(systemTime);
cloudLocationInfo.setTileId(String.valueOf(MogoApisHandler.getInstance().getApis().getMapServiceApi().getMapUIController().getTileId(lon, lat)));
mLastLocationInfo = cloudLocationInfo;
mMachineCacheList.add( cloudLocationInfo );
mMachineCacheList.add(cloudLocationInfo);
mCurSpeed = cloudLocationInfo.getSpeed();
mCurLon = cloudLocationInfo.getLon();
@@ -113,29 +119,29 @@ class SnapshotLocationController {
*
* @return 坐标合集
*/
public List< CloudLocationInfo > getSendLocationData() {
public List<CloudLocationInfo> getSendLocationData() {
List< CloudLocationInfo > list = null;
if ( mMachineCacheList != null ) {
List<CloudLocationInfo> list = null;
if (mMachineCacheList != null) {
mDataAccuracy = 1;
list = new ArrayList<>( mMachineCacheList );
list = new ArrayList<>(mMachineCacheList);
mMachineCacheList.clear();
}
if ( list == null || list.isEmpty() ) {
if (list == null || list.isEmpty()) {
mDataAccuracy = 0;
if ( mLocationList != null ) {
list = new ArrayList<>( mLocationList );
if (mLocationList != null) {
list = new ArrayList<>(mLocationList);
mLocationList.clear();
}
}
if ( list == null || list.isEmpty() ) {
if ( mLastLocationInfo != null ) {
if (list == null || list.isEmpty()) {
if (mLastLocationInfo != null) {
list = new ArrayList();
list.add( mLastLocationInfo );
list.add(mLastLocationInfo);
mLastLocationInfo = null;
}
}
Logger.d( TAG, "upload loc size = %s", list == null ? 0 : list.size() );
Logger.d(TAG, "upload loc size = %s", list == null ? 0 : list.size());
return list;
}
@@ -145,7 +151,7 @@ class SnapshotLocationController {
* @return 精度
*/
public int getDataAccuracy() {
Logger.d( TAG, "upload loc accuracy = %s", mDataAccuracy );
Logger.d(TAG, "upload loc accuracy = %s", mDataAccuracy);
return mDataAccuracy;
}

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

File diff suppressed because it is too large Load Diff

82
modules/mogo-module-service/src/main/java/com/mogo/module/service/status/EnvStatusManager.java
View File

@@ -15,14 +15,14 @@ import com.mogo.module.common.MogoApisHandler;
import com.mogo.module.common.wm.WindowManagerView;
import com.mogo.module.service.R;
public
/**
/*
* @author congtaowang
* @since 2021/3/17
*
* 环境状态
*/
class EnvStatusManager {
public class EnvStatusManager {
private static volatile EnvStatusManager sInstance;
@@ -30,9 +30,9 @@ class EnvStatusManager {
}
public static EnvStatusManager getInstance() {
if ( sInstance == null ) {
synchronized ( EnvStatusManager.class ) {
if ( sInstance == null ) {
if (sInstance == null) {
synchronized (EnvStatusManager.class) {
if (sInstance == null) {
sInstance = new EnvStatusManager();
}
}
@@ -51,13 +51,13 @@ class EnvStatusManager {
private WindowManagerView mPanelView;
private TextView mStatusTv;
private Handler mMainHandler = new Handler( Looper.getMainLooper() ) {
private final Handler mMainHandler = new Handler(Looper.getMainLooper()) {
@Override
public void handleMessage( Message msg ) {
super.handleMessage( msg );
if ( mPanelView.isShowing() ) {
public void handleMessage(Message msg) {
super.handleMessage(msg);
if (mPanelView.isShowing()) {
renderStatus();
mMainHandler.sendEmptyMessageDelayed( MSG, 5_000L );
mMainHandler.sendEmptyMessageDelayed(MSG, 5_000L);
}
}
};
@@ -69,54 +69,54 @@ class EnvStatusManager {
"近景",
"下发",
"AUTO",
"长链"
"长链",
"经度",
"纬度"
};
StringBuilder stringBuilder = new StringBuilder();
for ( int i = 0; i < sStatusName.length; i++ ) {
stringBuilder.append( sStatusName[i] ).append( ":" );
if ( i != 3 ) {
stringBuilder.append( "true".equals( DebugConfig.getStatus( i, true ) ) ? "正常" : "异常" ).append( "\n" );
for (int i = 0; i < sStatusName.length; i++) {
stringBuilder.append(sStatusName[i]).append(":");
if (i == 3) {
stringBuilder.append(DebugConfig.getAutoPilotStatus()).append("\n");
} else if (i == 5 || i == 6) {
stringBuilder.append(DebugConfig.getStatusData(i)).append("\n");
} else {
stringBuilder.append( DebugConfig.getAutoPilotStatus() ).append( "\n" );
stringBuilder.append("true".equals(DebugConfig.getStatus(i, true)) ? "正常" : "异常").append("\n");
}
}
mStatusTv.setText( stringBuilder );
if ( MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode() ) {
mStatusTv.setTextColor( Color.WHITE );
mStatusTv.setText(stringBuilder);
if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) {
mStatusTv.setTextColor(Color.WHITE);
} else {
if ( MogoApisHandler.getInstance().getApis().getAdasControllerApi()
.getCurrentSkinMode() == EnumMapUI.Type_Light ) {
mStatusTv.setTextColor( Color.BLACK );
if (MogoApisHandler.getInstance().getApis().getAdasControllerApi()
.getCurrentSkinMode() == EnumMapUI.Type_Light) {
mStatusTv.setTextColor(Color.BLACK);
} else {
mStatusTv.setTextColor( Color.WHITE );
mStatusTv.setTextColor(Color.WHITE);
}
}
}
public void showPanel( Context context ) {
if ( mPanelView == null ) {
mPanelView = new WindowManagerView.Builder( context )
.contentView( R.layout.module_services_status_panel )
.position( 0, 100 )
.size( ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT )
.gravity( Gravity.TOP )
public void showPanel(Context context) {
if (mPanelView == null) {
mPanelView = new WindowManagerView.Builder(context)
.contentView(R.layout.module_services_status_panel)
.position(0, 100)
.size(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT)
.gravity(Gravity.TOP)
.showInWindowManager();
mPanelView.attachTouchEvent( ( ( view, xPos, yPos ) -> {
closePanel();
} ) );
mPanelView.findViewById( R.id.module_services_status_iv ).setOnClickListener( view -> {
closePanel();
} );
mStatusTv = mPanelView.findViewById( R.id.module_services_status_tv );
mPanelView.attachTouchEvent(((view, xPos, yPos) -> closePanel()));
mPanelView.findViewById(R.id.module_services_status_iv).setOnClickListener(view -> closePanel());
mStatusTv = mPanelView.findViewById(R.id.module_services_status_tv);
}
mPanelView.show();
mMainHandler.sendEmptyMessageDelayed( MSG, 0L );
mMainHandler.sendEmptyMessageDelayed(MSG, 0L);
}
public void closePanel() {
if ( mPanelView != null ) {
if (mPanelView != null) {
mPanelView.dismiss();
mMainHandler.removeMessages( MSG );
mMainHandler.removeMessages(MSG);
}
}
}