From f430073ef8e63884eff78d57084f89e93fa0c1f0 Mon Sep 17 00:00:00 2001
From: yy1717 <fctom1215@outlook.com>
Date: 星期四, 05 三月 2020 13:33:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
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 93c7f01..2da26bd 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
@@ -83,7 +83,7 @@
private int item_id;//鎵ｅ垎鍒嗘暟鎬诲拰
private ExamStatusViewModel examStatusViewModel;
private static final int ADD_DATA = 1;
- private TextView tv_speed,tv_total_score,tv_sat_num,tv_name,tv_id;
+ private TextView tv_speed,tv_total_score,tv_sat_num,tv_name,tv_id,tv_work_platform;
private double speed=0.0;
private ImageView iv_rtk_status,iv_head;
@@ -229,6 +229,7 @@
if (appStatus != null){
Log.i(TAG, "onChanged: "+appStatus.toString());
iv_rtk_status.getDrawable().setLevel(appStatus.getRtk_connect_status());
+ tv_work_platform.setText(getString(R.string.platform_status,ExamPlatformData.getInstance().getExamplatformStatusStr(appStatus.getWork_platform())));
tv_sat_num.setText(String.valueOf(appStatus.getDefault_observe1()).length()==1?"0"+appStatus.getDefault_observe1():String.valueOf(appStatus.getDefault_observe1()));
}
}
@@ -341,6 +342,7 @@
houseView = view.findViewById(R.id.hv);
tv_name = view.findViewById(R.id.tv_name);
tv_id = view.findViewById(R.id.tv_ID);
+ tv_work_platform = view.findViewById(R.id.platform);
iv_rtk_status = view.findViewById(R.id.iv_rtk_connect);
iv_head = view.findViewById(R.id.iv_head);
--
Gitblit v1.8.0