From 6ecba06488059ca4bdc179f18648f161c0e7e43f Mon Sep 17 00:00:00 2001
From: yy1717 <fctom1215@outlook.com>
Date: 星期四, 09 一月 2020 16:47:18 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/endian11/DriveJudge
---
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java | 22 ++++++----------------
1 files changed, 6 insertions(+), 16 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 663b0bc..4733a3a 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
+++ b/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);
+
}
--
Gitblit v1.8.0