From 59798b3c20c1b6e7bde1c03cd1caecbaf0860572 Mon Sep 17 00:00:00 2001
From: yy1717 <fctom1215@outlook.com>
Date: 星期一, 09 三月 2020 17:13:47 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/endian11/DriveJudge
---
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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 1003371..fac164a 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
@@ -162,6 +162,7 @@
currTotalScore -=item_id;
if (currTotalScore < Constant.PASSING_SCORE){
MyLog.i(TAG,"浣庝簬80锛屼笉鍚堟牸");
+ ExamPlatformData.getInstance().getTTS().speak("鑰冭瘯涓嶅悎鏍�");
stopExam();
}
MyLog.i(TAG,"鐩戞祴鍒版湁澶辫触椤圭洰鍔犲叆锛岄�氱煡UI鏇存柊棰滆壊");
@@ -248,6 +249,9 @@
if (hasSnEqulas(failedProj_selects)){
}else{
+ ExamPlatformData.getInstance().getTTS().speak(failedProj_selects.get(i).getDeducting_reason()+(
+ failedProj_selects.get(i).getScore_deducting()==100?"涓嶅悎鏍�":"鎵�"+
+ failedProj_selects.get(i).getScore_deducting()+"鍒�"));
MyLog.i("娌℃湁鐩稿悓鐨剆n锛屽彂閫�");
sns.add(failedProj_selects.get(i).getSn());
jkMessage0203.timeBCD = failedProj_selects.get(i).getUtc();
@@ -334,7 +338,7 @@
private void initView(View view) {
- view.findViewById(R.id.profile).setOnClickListener(this);
+ view.findViewById(R.id.iv_head).setOnClickListener(this);
av_curve = view.findViewById(R.id.av3);
av_park = view.findViewById(R.id.av2);
av_podao = view.findViewById(R.id.av1);
@@ -400,10 +404,12 @@
jkMessage0202.ID = ExamPlatformData.getInstance().getID();
jkMessage0202.exam_id = ExamPlatformData.getInstance().getExam_id();
MessageProcessor.getInstance().sendMessage(jkMessage0202);
+ ExamPlatformData.getInstance().getTTS().speak("寮�濮嬭�冭瘯");
break;
case R.id.tv_stop:
Toast.makeText(_mActivity, "缁撴潫鑰冭瘯", Toast.LENGTH_SHORT).show();
stopExam();
+
break;
case R.id.view_map:
MapFragment mapFragment = findFragment(MapFragment.class);
@@ -416,7 +422,7 @@
case R.id.btn_return:
_mActivity.onBackPressed();
break;
- case R.id.profile:
+ case R.id.iv_head:
MyLog.i(TAG,"绛惧埌锛岃幏鍙栬韩浠借瘉鐗╃悊鍗″彿");
AYSdk.getInstance().sendCmd(Constant.READ_PHYSICAL_ID,"");
//TODO 鑾峰緱鐗╃悊鍗″彿 鍙戦�丣KMessage0201缁欏钩鍙帮紝鑾峰彇濮撳悕銆佽韩浠借瘉銆乭ead_url
@@ -445,6 +451,7 @@
iv_head.getDrawable().setLevel(0);
OneTimeWorkRequest examStatusInitWork = OneTimeWorkRequest.from(ExamStatusInitWorker.class);
WorkManager.getInstance(_mActivity).enqueue(examStatusInitWork);
+ ExamPlatformData.getInstance().getTTS().speak("缁撴潫鑰冭瘯");
sendExamJson(0);
//TODO 鍙戦�丣KMessage0204缁欏钩鍙� 缁撴潫鑰冭瘯
JKMessage0204 jkMessage0204 = new JKMessage0204();
--
Gitblit v1.8.0