lizhanwei
2020-03-23 06b8160354c724f7730ababe4df504a2fd8e3c25
完成科三项目状态颜色变化
3个文件已修改
4个文件已添加
128 ■■■■■ 已修改文件
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java 70 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java 21 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/drawable/ic_btn_daikao.xml 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/drawable/ic_btn_examing.xml 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/drawable/ic_btn_fail.xml 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/drawable/ic_btn_succ.xml 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/layout_base_datas.xml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
@@ -1,6 +1,7 @@
package safeluck.drive.evaluation.fragment;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.os.Handler;
@@ -102,7 +103,7 @@
    private FailedProjViewModel failedProjViewModel;
    String icson;//返回的ic卡信息 json
    private List<SimulateNightBean.QuestionBean> tempQs=  new ArrayList<>();
    private List<Integer> btn_ids = new ArrayList<Integer>();
    public static SupportFragment newInstance() {
        return new NetWorkTrainFragment();
    }
@@ -119,6 +120,11 @@
                av_park.setColor(aaa(safeluck.drive.evaluation.DB.Constant.EXAM_MAP_TYPE_PARK));
                av_curve.setColor(aaa(safeluck.drive.evaluation.DB.Constant.EXAM_MAP_TYPE_CURVE));
                av_zhijiao.setColor(aaa(safeluck.drive.evaluation.DB.Constant.EXAM_MAP_TYPE_ANGLE));
                for (int i = 0; i < btn_ids.size(); i++) {
                    int viewId = getResources().getIdentifier(String.valueOf(btn_ids.get(i)),"id",_mActivity.getPackageName());
                    ((Button) view.findViewById(viewId)).setBackground(bbb(100+i+1));
                }
            }
            if (msg.what == SPEED_DATA){
                tv_speed.setText(_mActivity.getApplicationContext().getResources().getString(R.string.speed,speed));
@@ -257,6 +263,58 @@
        }
        return getResources().getColor(R.color.examing);
    }
    /**
     * 路考项目 每个项目的颜色变化
     * @param type
     * @return
     */
    private Drawable bbb(int type) {
        if (examStatusList!=null &&examStatusList.size()>0){
            for (ExamStatus examStatus:
                    examStatusList) {
                if (type == examStatus.getMap_item()){
                    if (examStatus.getEnter() == safeluck.drive.evaluation.DB.Constant.BEGIN_ITEM){
                        //进入考场
                        if (examStatusList.get(0).getStartExam() == Constant.NONE_BEEN_START_EXAM){
                            //结束考试了
                            MyLog.i("进入考场结束考试,startexam="+examStatus.getStartExam());
                            return getResources().getDrawable(R.drawable.ic_btn_fail);
                        }else{
                            MyLog.i("进入考场,type="+type);
                            return getResources().getDrawable(R.drawable.ic_btn_examing);
                        }
                    }else if (examStatus.getEnter() == safeluck.drive.evaluation.DB.Constant.FINISH_ITEM){
                        if (examStatusList.get(0).getStartExam()==Constant.NONE_BEEN_START_EXAM){
                            return getResources().getDrawable(R.drawable.ic_btn_daikao);
                        }
                        String ss=ExamPlatformData.getInstance().getItemStatusStr(type);
                        if (item_conents.contains(ss)) {
                            MyLog.i("该项考试失败,type="+type);
                            return getResources().getDrawable(R.drawable.ic_btn_fail);
                        }else{
                            if (examStatus.getResult() ==1){
                                MyLog.i(String.format("已经播放过%s合格",ss));
                            }else{
                                ExamPlatformData.getInstance().getTTS().speak(String.format("%s合格",ss));
                                examStatusViewModel.updateItemExamResult(1,examStatus.getMap_id());
                            }
                            return getResources().getDrawable(R.drawable.ic_btn_succ);
                        }
                    }else{
                        return getResources().getDrawable(R.drawable.ic_btn_daikao);
                    }
                }
            }
        }
        return getResources().getDrawable(R.drawable.ic_btn_daikao);
    }
    private void showChangKaoOrLukao(int exam_type){
        if (exam_type > ExamPlatformData.EXAM_TYPE_ChangKAO){
            //show路考
@@ -442,6 +500,16 @@
    private void initView(View view) {
        btn_ids.add(R.id.btn_1);
        btn_ids.add(R.id.btn_2);
        btn_ids.add(R.id.btn_3);
        btn_ids.add(R.id.btn_4);
        btn_ids.add(R.id.btn_5);
        btn_ids.add(R.id.btn_6);
        btn_ids.add(R.id.btn_7);
        btn_ids.add(R.id.btn_8);
        btn_ids.add(R.id.btn_9);
        btn_ids.add(R.id.btn_10);
        view.findViewById(R.id.iv_head).setOnClickListener(this);
        av_curve = view.findViewById(R.id.av3);
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
@@ -4,6 +4,7 @@
import android.app.PendingIntent;
import android.content.Context;
import android.content.Intent;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import androidx.annotation.NonNull;
@@ -124,7 +125,6 @@
    private List<SimulateNightBean.QuestionBean> tempQs=  new ArrayList<>();
    private TableRow tableRow1,tableRow2,tableRow3;
    private Button btn_1,btn_2;
private List<Integer> btn_ids = new ArrayList<Integer>();
    private Handler mHandler = new Handler(new Handler.Callback() {
@@ -141,7 +141,8 @@
                for (int i = 0; i < btn_ids.size(); i++) {
                    int viewId = getResources().getIdentifier(String.valueOf(btn_ids.get(i)),"id",_mActivity.getPackageName());
                    ((Button) view.findViewById(viewId)).setBackgroundColor(100+i+1);
                    ((Button) view.findViewById(viewId)).setBackground(bbb(101+i));
                }
            }
            if (msg.what == SPEED_DATA){
@@ -288,7 +289,7 @@
     * @param type
     * @return
     */
    private int bbb(int type) {
    private Drawable bbb(int type) {
        if (examStatusList!=null &&examStatusList.size()>0){
            for (ExamStatus examStatus:
                    examStatusList) {
@@ -298,23 +299,23 @@
                        if (examStatusList.get(0).getStartExam() == Constant.NONE_BEEN_START_EXAM){
                            //结束考试了
                            MyLog.i("进入考场结束考试,startexam="+examStatus.getStartExam());
                            return getResources().getColor(R.color.colorAccent);
                            return getResources().getDrawable(R.drawable.ic_btn_fail);
                        }else{
                            MyLog.i("进入考场,type="+type);
                            return getResources().getColor(R.color.pink);
                            return getResources().getDrawable(R.drawable.ic_btn_examing);
                        }
                    }else if (examStatus.getEnter() == safeluck.drive.evaluation.DB.Constant.FINISH_ITEM){
                        if (examStatusList.get(0).getStartExam()==Constant.NONE_BEEN_START_EXAM){
                            return getResources().getColor(R.color.examing);
                            return getResources().getDrawable(R.drawable.ic_btn_daikao);
                        }
                        String ss=ExamPlatformData.getInstance().getItemStatusStr(type);
                        if (item_conents.contains(ss)) {
                            MyLog.i("该项考试失败,type="+type);
                            return getResources().getColor(R.color.colorAccent);
                            return getResources().getDrawable(R.drawable.ic_btn_fail);
                        }else{
                            if (examStatus.getResult() ==1){
                                MyLog.i(String.format("已经播放过%s合格",ss));
@@ -323,16 +324,16 @@
                                examStatusViewModel.updateItemExamResult(1,examStatus.getMap_id());
                            }
                            return getResources().getColor(R.color.train_btn_return);
                            return getResources().getDrawable(R.drawable.ic_btn_succ);
                        }
                    }else{
                        return getResources().getColor(R.color.examing);
                        return getResources().getDrawable(R.drawable.ic_btn_daikao);
                    }
                }
            }
        }
        return getResources().getColor(R.color.examing);
        return getResources().getDrawable(R.drawable.ic_btn_daikao);
    }
app/src/main/res/drawable/ic_btn_daikao.xml
New file
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="39.15625dp"
    android:height="32dp"
    android:viewportWidth="1253"
    android:viewportHeight="1024">
    <path
        android:pathData="M0,0m115.86,0l955.85,0q115.86,0 115.86,115.86l0,738.61q0,115.86 -115.86,115.86l-955.85,0q-115.86,0 -115.86,-115.86l0,-738.61q0,-115.86 115.86,-115.86Z"
        android:fillColor="#208AFF"/>
</vector>
app/src/main/res/drawable/ic_btn_examing.xml
New file
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="39.15625dp"
    android:height="32dp"
    android:viewportWidth="1253"
    android:viewportHeight="1024">
    <path
        android:pathData="M0,0m115.86,0l955.85,0q115.86,0 115.86,115.86l0,738.61q0,115.86 -115.86,115.86l-955.85,0q-115.86,0 -115.86,-115.86l0,-738.61q0,-115.86 115.86,-115.86Z"
        android:fillColor="#FF3399"/>
</vector>
app/src/main/res/drawable/ic_btn_fail.xml
New file
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="39.15625dp"
    android:height="32dp"
    android:viewportWidth="1253"
    android:viewportHeight="1024">
    <path
        android:pathData="M0,0m115.86,0l955.85,0q115.86,0 115.86,115.86l0,738.61q0,115.86 -115.86,115.86l-955.85,0q-115.86,0 -115.86,-115.86l0,-738.61q0,-115.86 115.86,-115.86Z"
        android:fillColor="#d4237a"/>
</vector>
app/src/main/res/drawable/ic_btn_succ.xml
New file
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="39.15625dp"
    android:height="32dp"
    android:viewportWidth="1253"
    android:viewportHeight="1024">
    <path
        android:pathData="M0,0m115.86,0l955.85,0q115.86,0 115.86,115.86l0,738.61q0,115.86 -115.86,115.86l-955.85,0q-115.86,0 -115.86,-115.86l0,-738.61q0,-115.86 115.86,-115.86Z"
        android:fillColor="#1afa29"/>
</vector>
app/src/main/res/layout/layout_base_datas.xml
@@ -361,6 +361,7 @@
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:id="@+id/btn_save_platform"
            android:background="@drawable/ic_btn_fail"
            android:text="保存"/>
    </LinearLayout>
<!--    </ScrollView>-->