From d98af7b0c477752e90b5d88ea2360811aaffb5b8 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期二, 14 一月 2020 16:26:45 +0800
Subject: [PATCH] 实时显示当前得分
---
app/src/main/java/safeluck/drive/evaluation/Constant.java | 1 +
app/src/main/res/values/strings.xml | 1 +
app/src/main/res/layout/profile_layout.xml | 3 ++-
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java | 9 ++++++++-
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java | 10 ++++++++--
5 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/Constant.java b/app/src/main/java/safeluck/drive/evaluation/Constant.java
index a10d45f..cccb7d0 100644
--- a/app/src/main/java/safeluck/drive/evaluation/Constant.java
+++ b/app/src/main/java/safeluck/drive/evaluation/Constant.java
@@ -66,5 +66,6 @@
public static final int REAL_TIME_CAR_POS = 0x000E;
public static final String REAL_TIME_POS_CAR_TOPIC = "real_time_car_pos_topic";
public static final String BIND_SPEED_TOPIC = "BIND_SPEED_TOPIC";
+ public static final int PASSING_SCORE = 80;
public static String exam_enter_exitdata="exam_enter_exitdata";
}
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 4d648e7..6813dec 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
@@ -68,9 +68,10 @@
private int item_id;//鎵ｅ垎鍒嗘暟鎬诲拰
private ExamStatusViewModel examStatusViewModel;
private static final int ADD_DATA = 1;
- private TextView tv_speed;
+ private TextView tv_speed,tv_total_score;
private double speed=0.0;
+ private int currTotalScore = 100;
private List<ScoreBean> mArrayList = new ArrayList<>();
private static final int SPEED_DATA = 2;
@@ -82,6 +83,7 @@
@Override
public boolean handleMessage(Message msg) {
if (msg.what == ADD_DATA){
+ tv_total_score.setText(getResources().getString(R.string.total_score,currTotalScore));
houseView.setColor(whatPaintColor(examStatusList.get(0)));
av_podao.setColor(whatPaintColor(examStatusList.get(1)));
av_park.setColor(whatPaintColor(examStatusList.get(2)));
@@ -118,7 +120,10 @@
item_conents.add(f.getItem_content());
mScoreAdapter.addDatas(mArrayList);
}
-
+ currTotalScore -=item_id;
+ if (currTotalScore < Constant.PASSING_SCORE){
+ MyLog.i(TAG,"浣庝簬80锛屼笉鍚堟牸");
+ }
MyLog.i(TAG,"鐩戞祴鍒版湁澶辫触椤圭洰鍔犲叆锛岄�氱煡UI鏇存柊棰滆壊");
mHandler.obtainMessage(ADD_DATA).sendToTarget();
}
@@ -212,6 +217,7 @@
houseView = view.findViewById(R.id.hv);
tv_speed = view.findViewById(R.id.tv_speed);
+ tv_total_score = view.findViewById(R.id.tv_total_score);
tv_speed.setText(getResources().getString(R.string.speed,speed));
view.findViewById(R.id.btn_return).setOnClickListener(this);
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
index ddb9b01..e3e6f0c 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
@@ -73,13 +73,15 @@
private List<ScoreBean> mArrayList = new ArrayList<>();
private View tv_stop;
- private TextView tv_speed;
+ private TextView tv_speed,tv_total_score;
+ private int currTotalScore = 100;
private double speed=0.0;
private Handler mHandler = new Handler(new Handler.Callback() {
@Override
public boolean handleMessage(Message msg) {
if (msg.what == ADD_DATA){
+ tv_total_score.setText(getResources().getString(R.string.total_score,currTotalScore));
houseView.setColor(whatPaintColor(examStatusList.get(0)));
av_podao.setColor(whatPaintColor(examStatusList.get(1)));
av_park.setColor(whatPaintColor(examStatusList.get(2)));
@@ -123,6 +125,10 @@
mArrayList.add(new ScoreBean(f.getScore_deducting(), f.getItem_content(), f.getDeducting_reason()));
item_conents.add(f.getItem_content());
mScoreAdapter.addDatas(mArrayList);
+ }
+ currTotalScore -=item_id;
+ if (currTotalScore < Constant.PASSING_SCORE){
+ MyLog.i(TAG,"浣庝簬80锛屼笉鍚堟牸");
}
MyLog.i(TAG,"鐩戞祴鍒版湁澶辫触椤圭洰鍔犲叆锛岄�氱煡UI鏇存柊棰滆壊");
@@ -170,6 +176,7 @@
houseView = view.findViewById(R.id.hv);
tv_speed = view.findViewById(R.id.tv_speed);
+ tv_total_score = view.findViewById(R.id.tv_total_score);
tv_speed.setText(getResources().getString(R.string.speed,speed));
view.findViewById(R.id.btn_return).setOnClickListener(this);
mListView = view.findViewById(R.id.lv);
diff --git a/app/src/main/res/layout/profile_layout.xml b/app/src/main/res/layout/profile_layout.xml
index 9bc183f..3a91a49 100644
--- a/app/src/main/res/layout/profile_layout.xml
+++ b/app/src/main/res/layout/profile_layout.xml
@@ -146,7 +146,8 @@
android:textColor="@android:color/white"
android:background="@android:color/holo_green_dark"
android:padding="5dp"
- android:text="100" />
+ android:id="@+id/tv_total_score"
+ android:text="@string/total_score" />
<TextView
android:layout_width="wrap_content"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3b1f022..ae4c702 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -26,4 +26,5 @@
<string name="rtk_config_login">RTK鐧诲綍缁撴灉锛�%1$d</string>
<string name="speed">杞﹂��:%1$.2fkm/h</string>
<string name="licheng">宸茶椹�:451km</string>
+ <string name="total_score">%1$d</string>
</resources>
--
Gitblit v1.8.0