Merge branch 'master' of https://gitee.com/endian11/DriveJudge

yy1717

2020-01-09 6ecba06488059ca4bdc179f18648f161c0e7e43f

 app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java

@@ -45,7 +45,7 @@
    private Button btn_train;
    private ScoreAdapter mScoreAdapter;

    private int item_id;
    private int item_id;//扣分分数总和

    private List<ScoreBean> mArrayList = new ArrayList<>();

@@ -78,16 +78,6 @@
        View view = inflater.inflate(R.layout.layout_train_fragment,container,false);
        initView(view);

        WokViewModel wokViewModel = ViewModelProviders.of(this).get(WokViewModel.class);
        wokViewModel.getStudents().observe(this, new Observer<List<Student>>() {
            @Override
            public void onChanged(List<Student> students) {
                for (Student student:
                     students) {
                    Log.i(TAG, "onChanged: "+student.toString());
                }
            }
        });


        FailedProjViewModel failedProjViewModel =ViewModelProviders.of(this).get(FailedProjViewModel.class);
@@ -95,11 +85,13 @@
            @Override
            public void onChanged(List<FailedProj_select> failedProj_selects) {
                item_id = 0;
                mArrayList.clear();
                for (FailedProj_select f :
                        failedProj_selects) {
                    item_id += f.getScore_deducting();
                    Log.i(TAG, "onChanged: "+f.toString());
                    Toast.makeText(getActivity().getApplicationContext(),"得分"+item_id,Toast.LENGTH_SHORT).show();
                    mArrayList.add(new ScoreBean(f.getScore_deducting(),f.getItem_content(),f.getDeducting_reason()));
                    mScoreAdapter.addDatas(mArrayList);
                }
            }
        });
@@ -109,6 +101,7 @@
    private void initView(View view) {

        mListView = view.findViewById(R.id.lv);
        mListView.setFocusable(false);//listview不获取焦点，不然的话scrollview会顶到底部
        view.findViewById(R.id.view_map).setOnClickListener(this);
        btn_train = view.findViewById(R.id.btn_start);
        btn_train.setOnClickListener(this);
@@ -117,10 +110,7 @@
        mListView.setAdapter(mScoreAdapter);

        mListView.addHeaderView(LayoutInflater.from(_mActivity).inflate(R.layout.layout_score_item,null));
        mArrayList.add(new ScoreBean(12,"直角转弯","后轮胎压线"));
        mArrayList.add(new ScoreBean(100,"倒车入库","未系安全带"));
        mArrayList.add(new ScoreBean(10,"坡道起步","一次熄火"));
        mScoreAdapter.addDatas(mArrayList);


    }