From 705d8e58aa6f13bf6883a7116c7de0edfa1567a6 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期二, 21 四月 2020 10:50:34 +0800
Subject: [PATCH] 修改联网考试细节ui；基本完成参数设置界面
---
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java | 77 ++++++++++++++++----------------------
1 files changed, 33 insertions(+), 44 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 e7372b7..758d410 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
@@ -95,7 +95,6 @@
private Button btn_start_exam;
private Button btn_return;
private TextView tv_stop;//鍛煎彨璇锋眰锛堢粨鏉熻�冭瘯锛�
- private Gson gson = new Gson();
private ScoreAdapter mScoreAdapter;
private Button av_zhijiao, av_curve, av_park, av_podao;
private Button houseView;
@@ -456,13 +455,11 @@
examStatusList.addAll(examStatus);
mHandler.obtainMessage(ADD_DATA).sendToTarget();
if (examStatus.get(0).getStartExam() != Constant.NONE_BEEN_START_EXAM){
-// btn_start_exam.setEnabled(false);
- tv_stop.setEnabled(true);
+ btn_start_exam.setText("缁撴潫璁粌");
iv_head.getDrawable().setLevel(1);
}else{
-// btn_start_exam.setEnabled(true);
- tv_stop.setEnabled(false);
iv_head.getDrawable().setLevel(0);
+ btn_start_exam.setText("寮�濮嬭缁�");
}
exam_type = examStatus.get(0).getStartExam();
}
@@ -584,9 +581,9 @@
view.findViewById(R.id.view_map).setOnClickListener(this);
mScoreAdapter = new ScoreAdapter(_mActivity);
mListView.setAdapter(mScoreAdapter);
-// btn_start_exam = view.findViewById(R.id.btn_start);
-// btn_start_exam.setText("寮�濮嬭缁�");
-// btn_start_exam.setOnClickListener(this);
+ btn_start_exam = view.findViewById(R.id.btn_start);
+ btn_start_exam.setText("寮�濮嬭缁�");
+ btn_start_exam.setOnClickListener(this);
tv_stop = view.findViewById(R.id.tv_stop);
tv_stop.setText("缁撴潫璁粌");
tv_stop.setOnClickListener(this);
@@ -595,49 +592,45 @@
MyDialogFragment myDialogFragment;
- SimulateNightBean simulateNightBean = null;
@Override
public void onClick(View v) {
switch (v.getId()) {
-// case R.id.btn_start:
-//
+ case R.id.btn_start:
// //TODO 鍙戦�丣KMessage0202 缁欏钩鍙帮紝寮�濮嬭�冭瘯
-// final JKMessage0202 jkMessage0202 = new JKMessage0202();
-// Date date = new Date();
-// wokViewModel.updateBeginTime(date.getTime());
-// jkMessage0202.timeBCD = date;
-// ExamPlatformData.getInstance().setExam_id(Utils.parseUnsignedInt(String.valueOf(date.getTime()/1000),10));
-// if (myDialogFragment == null){
-// myDialogFragment = new MyDialogFragment();
-// }
-// myDialogFragment.show(getFragmentManager(),"dialog");
-// myDialogFragment.setCallback(new MyDialogFragment.Callback() {
-// @Override
-// public void changKao() {
-//
-// sendJK0202(2);
-// }
-//
-// @Override
-// public void luKao() {
-// sendJK0202(3);
-//
-//
-//
-// }
-// });
+ if (btn_start_exam.getText().toString().equalsIgnoreCase("寮�濮嬭缁�")){
+ final JKMessage0202 jkMessage0202 = new JKMessage0202();
+ Date date = new Date();
+ wokViewModel.updateBeginTime(date.getTime());
+ jkMessage0202.timeBCD = date;
+ ExamPlatformData.getInstance().setExam_id(Utils.parseUnsignedInt(String.valueOf(date.getTime()/1000),10));
+ if (myDialogFragment == null){
+ myDialogFragment = new MyDialogFragment();
+ }
+ myDialogFragment.show(getFragmentManager(),"dialog");
+ myDialogFragment.setCallback(new MyDialogFragment.Callback() {
+ @Override
+ public void changKao() {
+
+ sendJK0202(2);
+ }
+
+ @Override
+ public void luKao() {
+ sendJK0202(3);
+ }
+ });
+ }else{
+ stopExam();
+ }
-// break;
- case R.id.tv_stop:
- Toast.makeText(_mActivity, "缁撴潫鑰冭瘯", Toast.LENGTH_SHORT).show();
- stopExam();
break;
+
case R.id.view_map:
if (ExamPlatformData.getInstance().getExamType()>ExamPlatformData.EXAM_TYPE_ChangKAO){
RoadDriveMapFragmentaa mapFragment = findFragment(RoadDriveMapFragmentaa.class);
@@ -656,11 +649,7 @@
}
break;
case R.id.btn_return:
-// _mActivity.onBackPressed();
- Log.i(TAG,"screenWidth="+ DimenUtil.getScreenWidth(_mActivity));
- Log.i(TAG,"screenHeight="+ DimenUtil.getScreenHeight(_mActivity));
- Log.i(TAG,"18px font ="+ DimenUtil.px2sp(_mActivity,18));
- Log.i(TAG,"48px dp ="+ DimenUtil.px2dp(_mActivity,48));
+ _mActivity.onBackPressed();
break;
case R.id.iv_head:
MyLog.i(TAG,"绛惧埌锛岃幏鍙栬韩浠借瘉鐗╃悊鍗″彿");
--
Gitblit v1.8.0