From 29cd07271e0e37ce1e4b5c0d7c56f98da208190f Mon Sep 17 00:00:00 2001
From: fctom1215 <fctom1215@outlook.com>
Date: 星期二, 10 三月 2020 15:08:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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 c7fb43f..01c396d 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
@@ -119,6 +119,7 @@
String icStr = jsSpeed.getString("serialno");
if (result == 0) {
JKMessage0201 jkMessage0201 = new JKMessage0201();
+ jkMessage0201.phone = ExamPlatformData.getInstance().getPhone();
jkMessage0201.currentExam = 0;
jkMessage0201.id = icStr;
MessageProcessor.getInstance().sendMessage(jkMessage0201);
@@ -156,6 +157,7 @@
item_conents.add(f.getItem_content());
Collections.reverse(mArrayList);
mScoreAdapter.addDatas(mArrayList);
+ MyLog.i("item_score="+item_id);
}
//TODO 鍙戦�丣KMessage0203 缁欏钩鍙帮紝杩欏効鏈夌偣澶嶆潅锛岀湅鎬庝箞澶勭悊
sendJKMessage0203(failedProj_selects);
@@ -242,7 +244,7 @@
private List<Integer> sns =new ArrayList<>();
private void sendJKMessage0203(List<FailedProj_select> failedProj_selects) {
JKMessage0203 jkMessage0203 = new JKMessage0203();
- jkMessage0203.phone = "0314200100000004";
+ jkMessage0203.phone = ExamPlatformData.getInstance().getPhone();
jkMessage0203.ID = ExamPlatformData.getInstance().getID();
jkMessage0203.exam_id = ExamPlatformData.getInstance().getExam_id();
@@ -401,7 +403,7 @@
sns.clear();
//TODO 鍙戦�丣KMessage0202 缁欏钩鍙帮紝寮�濮嬭�冭瘯
JKMessage0202 jkMessage0202 = new JKMessage0202();
- jkMessage0202.phone = "0314200100000004";
+ jkMessage0202.phone = ExamPlatformData.getInstance().getPhone();
jkMessage0202.timeBCD = new Date();
jkMessage0202.curr_exam = 0;
jkMessage0202.ID = ExamPlatformData.getInstance().getID();
@@ -460,7 +462,7 @@
sendExamJson(0);
//TODO 鍙戦�丣KMessage0204缁欏钩鍙� 缁撴潫鑰冭瘯
JKMessage0204 jkMessage0204 = new JKMessage0204();
- jkMessage0204.phone = "0314200100000004";
+ jkMessage0204.phone = ExamPlatformData.getInstance().getPhone();
jkMessage0204.timeBCD = new Date();
jkMessage0204.score = 10;
jkMessage0204.stop = JKMessage0204.SUCC_STOP;
--
Gitblit v1.8.0