From 646d4e3594172f321b0b17be02ac959e80f13b8f Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期一, 13 一月 2020 17:50:04 +0800
Subject: [PATCH] 修改车辆模型；
---
app/src/main/assets/vehiclemodel.json | 14 +++++++-------
app/src/main/java/safeluck/drive/evaluation/bean/ExamStatus.java | 4 ++++
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java | 11 ++++-------
3 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/app/src/main/assets/vehiclemodel.json b/app/src/main/assets/vehiclemodel.json
index 64ba654..30509bf 100644
--- a/app/src/main/assets/vehiclemodel.json
+++ b/app/src/main/assets/vehiclemodel.json
@@ -1,9 +1,9 @@
{
- "main_ant": [123.3, 85.5],
- "axial": [0, 18],
- "left_front_tire": [4, 5],
- "right_front_tire": [6, 7],
- "left_rear_tire": [8, 9],
- "right_rear_tire": [10, 11],
- "point": [-11.9669, 28.013, -11.5114, 27.137, -10.8069, 27.5039, -10.2969, 26.4212, -9.2102, 26.8894, -9.6513, 28.0027, -8.9758, 28.3797, -9.5057, 29.3232]
+ "main_ant": [0, 0],
+ "axial": [0, 3],
+ "left_front_tire": [1, 0],
+ "right_front_tire": [5, 0],
+ "left_rear_tire": [2, 3],
+ "right_rear_tire": [4, 3],
+ "point": [0, 2, -1, 2, -1, -1, 0, -1, 1, -1, 1, 2]
}
\ No newline at end of file
diff --git a/app/src/main/java/safeluck/drive/evaluation/bean/ExamStatus.java b/app/src/main/java/safeluck/drive/evaluation/bean/ExamStatus.java
index dda0fa4..fdb32f5 100644
--- a/app/src/main/java/safeluck/drive/evaluation/bean/ExamStatus.java
+++ b/app/src/main/java/safeluck/drive/evaluation/bean/ExamStatus.java
@@ -12,6 +12,8 @@
//1 杩涘叆锛堟鍦ㄨ繘琛岃�冭瘯锛� 2-寰呰��
private int enter;
+
+
public ExamStatus(int map_id, int enter) {
this.map_id = map_id;
this.enter = enter;
@@ -32,4 +34,6 @@
public void setEnter(int enter) {
this.enter = enter;
}
+
+
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
index f491f88..33981af 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
@@ -71,6 +71,7 @@
@Override
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.layout_train_fragment, container, false);
+ item_conents.add("渚ф柟鍋滆溅");
initView(view);
FailedProjViewModel failedProjViewModel = ViewModelProviders.of(this).get(FailedProjViewModel.class);
@@ -91,7 +92,7 @@
}
});
- item_conents.add("渚ф柟鍋滆溅");
+
return view;
}
@@ -149,7 +150,7 @@
av_zhijiao = view.findViewById(R.id.av1);
houseView = view.findViewById(R.id.hv);
//绮夌孩鑹叉鍦ㄨ繘琛岃椤圭洰鐨勮�冭瘯
- examStatusList.add(new ExamStatus(1, 2));
+ examStatusList.add(new ExamStatus(1, 0));
examStatusList.add(new ExamStatus(2, 1));
examStatusList.add(new ExamStatus(3, 0));
examStatusList.add(new ExamStatus(4, 2));
@@ -162,7 +163,6 @@
av_park.setColor(whatPaintColor(examStatusList.get(2)));
houseView.setColor(whatPaintColor(examStatusList.get(0)));
- sendRTKConfig2RemoteService();
mListView = view.findViewById(R.id.lv);
mListView.setFocusable(false);
view.findViewById(R.id.view_map).setOnClickListener(this);
@@ -175,10 +175,7 @@
}
- private void sendRTKConfig2RemoteService() {
-// MyLog.d(TAG,"涓诲姩鎺ㄩ�丷TKConfig");
-// CEventCenter.dispatchEvent(Constant.BIND_RTKCONFIG_TOPIC,Constant.FETCH_RTK_PLATFORM_INFO,0,"");
- }
+
@Override
public void onClick(View v) {
--
Gitblit v1.8.0