From edb7e4b8e645c1c0ccb2825bf02cc620e87b103f Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期一, 23 三月 2020 13:52:20 +0800
Subject: [PATCH] 根据用户选择来进行科二、科三项目展示；默认科二、结束考试也是科二
---
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java | 21 ++++++++++++++++-----
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java | 16 ++++++++++++++--
2 files changed, 30 insertions(+), 7 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 ef58831..98cd3e9 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
@@ -257,11 +257,22 @@
}
return getResources().getColor(R.color.examing);
}
-
+ private void showChangKaoOrLukao(int exam_type){
+ if (exam_type > ExamPlatformData.EXAM_TYPE_ChangKAO){
+ //show璺��
+ view.findViewById(R.id.lukao).setVisibility(View.VISIBLE);
+ view.findViewById(R.id.changkao).setVisibility(View.GONE);
+ }else{
+ //show鍦鸿��
+ view.findViewById(R.id.lukao).setVisibility(View.GONE);
+ view.findViewById(R.id.changkao).setVisibility(View.VISIBLE);
+ }
+ }
+ View view;
@Nullable
@Override
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
- View view = inflater.inflate(R.layout.layout_train_fragment, container, false);
+ view = inflater.inflate(R.layout.layout_train_fragment, container, false);
initView(view);
failedProjViewModel = ViewModelProviders.of(this).get(FailedProjViewModel.class);
@@ -368,6 +379,7 @@
Log.i(TAG, "ExamStatus onChanged: ");
if (examStatus!=null && examStatus.size()>0){
MyLog.i(TAG,"鑰冭瘯鐘舵�佹洿鏂�");
+ showChangKaoOrLukao(examStatus.get(0).getStartExam());
examStatusList.clear();
examStatusList.addAll(examStatus);
mHandler.obtainMessage(ADD_DATA).sendToTarget();
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 e315f1f..36e4528 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
@@ -276,10 +276,23 @@
return getResources().getColor(R.color.examing);
}
+
+ private void showChangKaoOrLukao(int exam_type){
+ if (exam_type > ExamPlatformData.EXAM_TYPE_ChangKAO){
+ //show璺��
+ view.findViewById(R.id.lukao).setVisibility(View.VISIBLE);
+ view.findViewById(R.id.changkao).setVisibility(View.GONE);
+ }else{
+ //show鍦鸿��
+ view.findViewById(R.id.lukao).setVisibility(View.GONE);
+ view.findViewById(R.id.changkao).setVisibility(View.VISIBLE);
+ }
+ }
+ View view;
@Nullable
@Override
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
- View view = inflater.inflate(R.layout.layout_train_fragment, container, false);
+ view = inflater.inflate(R.layout.layout_train_fragment, container, false);
initView(view);
failedProjViewModel = ViewModelProviders.of(this).get(FailedProjViewModel.class);
@@ -311,8 +324,6 @@
MyLog.i("璺�冨綋鍓嶅緱鍒嗭細"+currTotalScore);
if (currTotalScore < Constant.PASSING_SCORE){
MyLog.i("璺�冧綆浜�80锛屼笉鍚堟牸"+currTotalScore);
-// ExamPlatformData.getInstance().getTTS().speak("鑰冭瘯涓嶅悎鏍�");
-// stopExam();
}
MyLog.i("璺�冪洃娴嬪埌鏈夊け璐ラ」鐩姞鍏ワ紝閫氱煡UI鏇存柊棰滆壊");
mHandler.obtainMessage(ADD_DATA).sendToTarget();
@@ -359,8 +370,6 @@
MyLog.i("褰撳墠寰楀垎锛�"+currTotalScore);
if (currTotalScore < Constant.PASSING_SCORE){
MyLog.i("浣庝簬80锛屼笉鍚堟牸"+currTotalScore);
-// ExamPlatformData.getInstance().getTTS().speak("鑰冭瘯涓嶅悎鏍�");
-// stopExam();
}
MyLog.i("鐩戞祴鍒版湁澶辫触椤圭洰鍔犲叆锛岄�氱煡UI鏇存柊棰滆壊");
mHandler.obtainMessage(ADD_DATA).sendToTarget();
@@ -388,6 +397,7 @@
Log.i(TAG, "ExamStatus onChanged: ");
if (examStatus!=null && examStatus.size()>0){
+ showChangKaoOrLukao(examStatus.get(0).getStartExam());
MyLog.i(TAG,"鑰冭瘯鐘舵�佹洿鏂�");
examStatusList.clear();
examStatusList.addAll(examStatus);
@@ -535,6 +545,7 @@
myDialogFragment.setCallback(new MyDialogFragment.Callback() {
@Override
public void changKao() {
+
exam_type = 2;
iv_head.getDrawable().setLevel(1);
ExamPlatformData.getInstance().setTrainingMode(ExamPlatformData.TRAINING_MODE);
--
Gitblit v1.8.0