From 1b7c87b81313bca47a6847f203be329a63decff3 Mon Sep 17 00:00:00 2001
From: yy1717 <fctom1215@outlook.com>
Date: 星期四, 16 四月 2020 18:15:05 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/endian11/DriveJudge
---
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java | 64 +++++++++++++++++--------------
1 files changed, 35 insertions(+), 29 deletions(-)
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 baebf8b..da8ebf4 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
@@ -6,6 +6,7 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProviders;
import androidx.work.OneTimeWorkRequest;
@@ -59,6 +60,7 @@
import safeluck.drive.evaluation.cEventCenter.ICEventListener;
import safeluck.drive.evaluation.customview.ArrowView;
import safeluck.drive.evaluation.customview.HouseView;
+import safeluck.drive.evaluation.customview.LoadProgressDialog;
import safeluck.drive.evaluation.customview.MyDialogFragment;
import safeluck.drive.evaluation.im.MessageProcessor;
import safeluck.drive.evaluation.platformMessage.JKMessage0201;
@@ -106,8 +108,9 @@
private static final int SPEED_DATA = 2;
private FailedProjViewModel failedProjViewModel;
String icson;//杩斿洖鐨刬c鍗′俊鎭� json
- private List<SimulateNightBean.QuestionBean> tempQs= new ArrayList<>();
- private TableRow tableRow1,tableRow2,tableRow3;
+ private String content;//鐢ㄤ互鐢熸垚浜岀淮鐮佺殑鍐呭
+
+ private LoadProgressDialog loadProgressDialog;
private List<Integer> btn_ids = new ArrayList<Integer>();
@@ -474,6 +477,8 @@
tv_sex.setText(getString(R.string.sex)+(student.getSex()==2?"濂�":"鐢�"));
tv_start_time.setText(getString(R.string.begin_time)+Utils.formatTimeYYMMDDHHmmSS(student.getBegin_time()));
+ }else if (!TextUtils.isEmpty(student.getName())&&student.getStu_id()==ExamPlatformData.COACH_ID){
+ ExamPlatformData.getInstance().setCoachID(student.getID());
}
}
}
@@ -542,10 +547,6 @@
tv_total_score = view.findViewById(R.id.tv_total_score);
tv_network_time = view.findViewById(R.id.network_time);
- tableRow1 = view.findViewById(R.id.first);
- tableRow2 = view.findViewById(R.id.second);
- tableRow3 = view.findViewById(R.id.third);
-
tv_network_time.setText(Utils.getHHmm());
@@ -606,30 +607,12 @@
@Override
public void changKao() {
- exam_type = 2;
- ExamPlatformData.getInstance().setTrainingMode(ExamPlatformData.TRAINING_MODE);//璁剧疆涓鸿缁冩ā寮�
- ExamPlatformData.getInstance().setExamType(exam_type);
- examStatusViewModel.updateStartExam(exam_type);
- sendExamJson(1,exam_type);
- ExamPlatformData.getInstance().getTTS().speak("寮�濮嬭缁�");
- jkMessage0202.curr_exam = 0;
-
- jkMessage0202.mode = ExamPlatformData.getInstance().getExamType()==ExamPlatformData.TRAINING_MODE?1:0;
-
- MessageProcessor.getInstance().sendMessage(jkMessage0202);
+ sendJK0202(2);
}
@Override
public void luKao() {
- exam_type = 3;
- ExamPlatformData.getInstance().setTrainingMode(ExamPlatformData.TRAINING_MODE);
- ExamPlatformData.getInstance().setExamType(exam_type);
- examStatusViewModel.updateStartExam(exam_type);
- sendExamJson(1,exam_type);
- ExamPlatformData.getInstance().getTTS().speak("寮�濮嬭缁�");
- jkMessage0202.curr_exam = 1;
- jkMessage0202.mode = ExamPlatformData.getInstance().getExamType()==ExamPlatformData.TRAINING_MODE?1:0;
- MessageProcessor.getInstance().sendMessage(jkMessage0202);
+ sendJK0202(3);
@@ -669,13 +652,36 @@
break;
case R.id.iv_head:
MyLog.i(TAG,"绛惧埌锛岃幏鍙栬韩浠借瘉鐗╃悊鍗″彿");
- AYSdk.getInstance().sendCmd(Constant.READ_PHYSICAL_ID,"");
- //TODO 鑾峰緱鐗╃悊鍗″彿 鍙戦�丣KMessage0201缁欏钩鍙帮紝鑾峰彇濮撳悕銆佽韩浠借瘉銆乭ead_url
-
+ loadProgressDialog = LoadProgressDialog.newInstance("璇风◢鍚�...");
+ loadProgressDialog.setStyle(DialogFragment.STYLE_NORMAL,R.style.Dialog_FullScreen);
+ loadProgressDialog.showNow(getFragmentManager(),"loadingdiaolog");
break;
}
}
+ private void sendJK0202(int type) {
+
+ final JKMessage0202 jkMessage0202 = new JKMessage0202();
+ exam_type = type;
+ ExamPlatformData.getInstance().setTrainingMode(ExamPlatformData.TRAINING_MODE);
+ ExamPlatformData.getInstance().setExamType(exam_type);
+ examStatusViewModel.updateStartExam(exam_type);
+ sendExamJson(1,exam_type);
+ ExamPlatformData.getInstance().getTTS().speak("寮�濮嬭缁�");
+
+ Date date = new Date();
+ wokViewModel.updateBeginTime(date.getTime());
+ jkMessage0202.timeBCD = date;
+ ExamPlatformData.getInstance().setExam_id(Utils.parseUnsignedInt(String.valueOf(date.getTime()/1000),10));
+ jkMessage0202.stu_id = ExamPlatformData.getInstance().getID();
+ jkMessage0202.coach_id = ExamPlatformData.getInstance().getCoachID();
+ jkMessage0202.exam_id = ExamPlatformData.getInstance().getExam_id();
+
+ jkMessage0202.curr_exam = (type-2);// 璺熺Щ鍔ㄧ珯鏈嶅姟瀹氫箟鐨勫満鑰冩槸2 锛屽钩鍙版槸0 锛� 绉诲姩绔欒矾鑰冩槸3 锛屽钩鍙版槸1
+ jkMessage0202.mode = ExamPlatformData.getInstance().getTrainingMode()==ExamPlatformData.TRAINING_MODE?1:0;
+ MessageProcessor.getInstance().sendMessage(jkMessage0202);
+ }
+
private void sendExamJson(int i,int type) {
try {
--
Gitblit v1.8.0