From 88ed5029fdf3315e9a4437c49c76b592846b08b4 Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Wed, 20 Jul 2022 18:52:31 +0800 Subject: [PATCH] =?UTF-8?q?[change]=E4=BF=AE=E6=94=B9=E8=B0=83=E8=AF=95?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app_ipc_monitoring/build.gradle | 13 ++++++++++++- .../com/zhidao/adas/client/ui/MainActivity.java | 17 ++++++++++------- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/app_ipc_monitoring/build.gradle b/app_ipc_monitoring/build.gradle index c4618badc1..4687bb6a0f 100644 --- a/app_ipc_monitoring/build.gradle +++ b/app_ipc_monitoring/build.gradle @@ -24,10 +24,21 @@ android { } } } - + signingConfigs { + release { + keyAlias 'CarLauncher' + keyPassword 'ZDauto123456' + storeFile file(getProjectDir().getParent() + '/keystore/car_launcher.jks') + storePassword 'ZDauto123456' + } + } buildTypes { + debug { + signingConfig signingConfigs.release + } release { minifyEnabled false + signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } diff --git a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/MainActivity.java b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/MainActivity.java index ea1dbb78bb..c96b79002f 100644 --- a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/MainActivity.java +++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/MainActivity.java @@ -43,8 +43,6 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.SimpleItemAnimator; -import com.google.protobuf.InvalidProtocolBufferException; -import com.google.protobuf.TextFormat; import com.mogo.telematic.MogoProtocolMsg; import com.mogo.telematic.NSDNettyManager; import com.mogo.telematic.client.listener.NettyClientListener; @@ -56,7 +54,6 @@ import com.zhidao.adas.client.R; import com.zhidao.adas.client.adapter.InfoTitleAdapter; import com.zhidao.adas.client.base.BaseActivity; import com.zhidao.adas.client.base.BaseAdapter; -import com.zhidao.adas.client.base.BaseFragment; import com.zhidao.adas.client.bean.ArrivalNotification; import com.zhidao.adas.client.bean.AutopilotState; import com.zhidao.adas.client.bean.BasicInfoReq; @@ -66,7 +63,6 @@ import com.zhidao.adas.client.bean.GlobalPathResp; import com.zhidao.adas.client.bean.GnssInfo; import com.zhidao.adas.client.bean.IPCConnectState; import com.zhidao.adas.client.bean.MogoReportMessage; -import com.zhidao.adas.client.bean.MyPointCloud; import com.zhidao.adas.client.bean.OriginalPointCloudData; import com.zhidao.adas.client.bean.PerceptionTrafficLight; import com.zhidao.adas.client.bean.PlanningObjects; @@ -105,10 +101,8 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.Enumeration; -import java.util.HashMap; import java.util.List; import java.util.Locale; -import java.util.Map; import java.util.concurrent.ScheduledExecutorService; import chassis.VehicleStateOuterClass; @@ -118,7 +112,6 @@ import mogo_msg.MogoReportMsg; import perception.TrafficLightOuterClass; import prediction.Prediction; import record_cache.RecordPanelOuterClass; -import rule_segement.MogoPointCloudOuterClass; import system_master.SystemStatusInfo; public class MainActivity extends BaseActivity implements OnAdasListener, OnAdasConnectStatusListener, BaseAdapter.OnItemClickListener { @@ -860,6 +853,16 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas @Override public void onPointCloud(byte[] pointCloud) { // try { +// MogoPointCloudOuterClass.MogoPointCloud pointCloud1 = MogoPointCloudOuterClass.MogoPointCloud.parseFrom(pointCloud); +// HeaderOuterClass.Time time = pointCloud1.getHeader().getStamp(); +// int s = time.getSec(); +// int ns = time.getNsec(); +// long t = (long) (s * 1000L) + (long) (ns / 1000000.d); +// Log.i(TAG, "PointCloud=" + sdf.format(new Date(t))); +// } catch (InvalidProtocolBufferException e) { +// e.printStackTrace(); +// } +// try { // MogoPointCloudOuterClass.MogoPointCloud bean = MogoPointCloudOuterClass.MogoPointCloud.parseFrom(pointCloud); // Log.i("ddd","MogoPointCloud="+ TextFormat.printer().escapingNonAscii(false).printToString(bean)); // } catch (InvalidProtocolBufferException e) {