From 18ffd0ba7e9387b01d2420770d2bb6672a58eac4 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期三, 15 一月 2020 18:49:14 +0800
Subject: [PATCH] 低于80发送结束考试指令
---
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java | 27 ++++++++-----
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java | 27 ++++++++-----
app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java | 12 ++++++
3 files changed, 44 insertions(+), 22 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java
index b27fd2d..623b059 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java
@@ -339,6 +339,18 @@
MyLog.i(TAG, json);
RealTimeCarPos timeCarPos = gson.fromJson((String) json, RealTimeCarPos.class);
List<Double> points = timeCarPos.getPoint();
+ switch (timeCarPos.getMove()){
+ case 0:
+ osd2 = "鍋滆溅";
+ break;
+ case 1:
+ osd2 = "鍓嶈繘";
+ break;
+ case -1:
+ osd2 = "鍚庨��";
+ break;
+ }
+ osd="鏂瑰悜瑙�"+String.valueOf(timeCarPos.getHeading());
line = 0;
map_line = 0;
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 ff5585c..04adca1 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
@@ -129,6 +129,7 @@
currTotalScore -=item_id;
if (currTotalScore < Constant.PASSING_SCORE){
MyLog.i(TAG,"浣庝簬80锛屼笉鍚堟牸");
+ stopExam();
}
MyLog.i(TAG,"鐩戞祴鍒版湁澶辫触椤圭洰鍔犲叆锛岄�氱煡UI鏇存柊棰滆壊");
mHandler.obtainMessage(ADD_DATA).sendToTarget();
@@ -290,17 +291,7 @@
break;
case R.id.tv_stop:
Toast.makeText(_mActivity, "缁撴潫鑰冭瘯", Toast.LENGTH_SHORT).show();
- OneTimeWorkRequest examStatusInitWork = OneTimeWorkRequest.from(ExamStatusInitWorker.class);
- WorkManager.getInstance(_mActivity).enqueue(examStatusInitWork);
- try {
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("exam", 0);
- String examJson = jsonObject.toString();
- Log.i(TAG, "onClick: " + examJson);
- AYSdk.getInstance().sendCmd(Constant.EXAM_STATUS, examJson);
- } catch (JSONException e) {
- e.printStackTrace();
- }
+ stopExam();
break;
case R.id.view_map:
MapFragment mapFragment = findFragment(MapFragment.class);
@@ -315,6 +306,20 @@
}
}
+ private void stopExam() {
+ OneTimeWorkRequest examStatusInitWork = OneTimeWorkRequest.from(ExamStatusInitWorker.class);
+ WorkManager.getInstance(_mActivity).enqueue(examStatusInitWork);
+ try {
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("exam", 0);
+ String examJson = jsonObject.toString();
+ Log.i(TAG, "onClick: " + examJson);
+ AYSdk.getInstance().sendCmd(Constant.EXAM_STATUS, examJson);
+ } catch (JSONException e) {
+ e.printStackTrace();
+ }
+ }
+
private ICEventListener icEventListener = new ICEventListener() {
@Override
public void onCEvent(String topic, int msgCode, int resultCode, Object obj) {
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 5715aa7..4f32832 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
@@ -133,6 +133,7 @@
currTotalScore -=item_id;
if (currTotalScore < Constant.PASSING_SCORE){
MyLog.i(TAG,"浣庝簬80锛屼笉鍚堟牸");
+ stopExam();
}
MyLog.i(TAG,"鐩戞祴鍒版湁澶辫触椤圭洰鍔犲叆锛岄�氱煡UI鏇存柊棰滆壊");
@@ -289,17 +290,7 @@
break;
case R.id.tv_stop:
Toast.makeText(_mActivity, "缁撴潫鑰冭瘯", Toast.LENGTH_SHORT).show();
- OneTimeWorkRequest examStatusInitWork = OneTimeWorkRequest.from(ExamStatusInitWorker.class);
- WorkManager.getInstance(_mActivity).enqueue(examStatusInitWork);
- try {
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("exam", 0);
- String examJson = jsonObject.toString();
- Log.i(TAG, "onClick: " + examJson);
- AYSdk.getInstance().sendCmd(Constant.EXAM_STATUS, examJson);
- } catch (JSONException e) {
- e.printStackTrace();
- }
+ stopExam();
break;
case R.id.btn_return:
_mActivity.onBackPressed();
@@ -307,6 +298,20 @@
}
}
+ private void stopExam() {
+ OneTimeWorkRequest examStatusInitWork = OneTimeWorkRequest.from(ExamStatusInitWorker.class);
+ WorkManager.getInstance(_mActivity).enqueue(examStatusInitWork);
+ try {
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("exam", 0);
+ String examJson = jsonObject.toString();
+ Log.i(TAG, "onClick: " + examJson);
+ AYSdk.getInstance().sendCmd(Constant.EXAM_STATUS, examJson);
+ } catch (JSONException e) {
+ e.printStackTrace();
+ }
+ }
+
private ICEventListener icEventListener = new ICEventListener() {
@Override
public void onCEvent(String topic, int msgCode, int resultCode, Object obj) {
--
Gitblit v1.8.0