From abd45567c3fc695d0f360929b80730cbb61d69c9 Mon Sep 17 00:00:00 2001
From: Admin <Dana_Lee1016@126.com>
Date: 星期一, 22 二月 2021 13:35:55 +0800
Subject: [PATCH] 增加时间和项目编号
---
app/src/main/java/safeluck/drive/evaluation/bean/ScoreBean.java | 16 +++++++
app/src/main/java/safeluck/drive/evaluation/adapter/ScoreAdapter.java | 9 ++++
app/src/main/res/layout/layout_score_item.xml | 18 +++++++++
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java | 4 +-
app/src/main/res/layout/layout_score_item_title.xml | 37 ++++++++++++++++++
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java | 2
6 files changed, 82 insertions(+), 4 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/adapter/ScoreAdapter.java b/app/src/main/java/safeluck/drive/evaluation/adapter/ScoreAdapter.java
index b1b70a8..f8decb0 100644
--- a/app/src/main/java/safeluck/drive/evaluation/adapter/ScoreAdapter.java
+++ b/app/src/main/java/safeluck/drive/evaluation/adapter/ScoreAdapter.java
@@ -13,6 +13,7 @@
import safeluck.drive.evaluation.R;
import safeluck.drive.evaluation.bean.ScoreBean;
+import safeluck.drive.evaluation.util.Utils;
/**
* MyApplication2
@@ -79,6 +80,10 @@
ScoreBean scoreBean = getItem(position);
dataHodler.tv_item.setTextColor(Color.parseColor("#FFFFFF"));
dataHodler.tv_item.setText(scoreBean.getItem());
+ dataHodler.tv_item_time.setTextColor(Color.parseColor("#FFFFFF"));
+ dataHodler.tv_item_time.setText(Utils.formatTimeYYMMDDHHmmSS(scoreBean.getUtc()));
+ dataHodler.tv_item_code.setTextColor(Color.parseColor("#FFFFFF"));
+ dataHodler.tv_item_code.setText(scoreBean.getItem_code()+"");
dataHodler.tv_score.setTextColor(Color.parseColor("#FE910B"));
dataHodler.tv_score.setText(String.format("-%.0f鍒�",scoreBean.getScore()));
@@ -91,11 +96,15 @@
TextView tv_score;
TextView tv_reason;
TextView tv_item;
+ TextView tv_item_time;
+ TextView tv_item_code;
public DataHodler(View view) {
this.tv_score = view.findViewById(R.id.tv_score);
this.tv_reason = view.findViewById(R.id.tv_reason);
this.tv_item = view.findViewById(R.id.tv_item);
+ this.tv_item_time = view.findViewById(R.id.tv_item_time);
+ this.tv_item_code = view.findViewById(R.id.tv_item_code);
}
}
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/bean/ScoreBean.java b/app/src/main/java/safeluck/drive/evaluation/bean/ScoreBean.java
index 923a77f..5aa04d8 100644
--- a/app/src/main/java/safeluck/drive/evaluation/bean/ScoreBean.java
+++ b/app/src/main/java/safeluck/drive/evaluation/bean/ScoreBean.java
@@ -18,7 +18,19 @@
/**鎵ｅ垎鍘熷洜*/
private String reason;
+
+ private int item_code;
+
private long mUtc;
+
+ public int getItem_code() {
+ return item_code;
+ }
+
+ public void setItem_code(int item_code) {
+ this.item_code = item_code;
+ }
+
public ScoreBean(float mScore, String mItem, String reason) {
@@ -26,7 +38,7 @@
this.mItem = mItem;
this.reason = reason;
}
- public ScoreBean(float mScore, String mItem, String reason,String utc) {
+ public ScoreBean(float mScore, String mItem, String reason,String utc,int item_code) {
this.mScore = mScore;
this.mItem = mItem;
this.reason = reason;
@@ -36,8 +48,10 @@
}else{
MyLog.i("utc鏃堕棿涓嶆槸绾暟瀛�"+utc);
+ mUtc = System.currentTimeMillis();
}
+ this.item_code= item_code;
}
public long getUtc() {
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 baa117d..e00011a 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
@@ -358,7 +358,7 @@
failedProj_selects) {
item_id += f.getScore_deducting();
Log.i(TAG, "onChanged: " + f.toString());
- mArrayList.add(new ScoreBean(f.getScore_deducting(), f.getItem_content(), f.getDeducting_reason(),f.getUtc()));
+ mArrayList.add(new ScoreBean(f.getScore_deducting(), f.getItem_content(), f.getDeducting_reason(),f.getUtc(),f.getEmp_id()));
item_conents.add(f.getItem_content());
Collections.sort(mArrayList);
mScoreAdapter.addDatas(mArrayList);
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 0aa5f92..6c46b1b 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
@@ -218,7 +218,7 @@
MyLog.i("杩涘叆鑰冨満缁撴潫鑰冭瘯锛宻tartexam="+examStatus.getStartExam());
return getResources().getDrawable(R.drawable.ic_btn_fail);
}else{
- MyLog.i("杩涘叆鑰冨満锛宼ype="+type);
+ MyLog.i(TAG,"杩涘叆鑰冨満锛宼ype="+type);
return getResources().getDrawable(R.drawable.ic_btn_examing);
}
@@ -533,7 +533,7 @@
failedProj_selects) {
item_id += f.getScore_deducting();
Log.i(TAG, "onChanged: " + f.toString());
- mArrayList.add(new ScoreBean(f.getScore_deducting(), f.getItem_content(), f.getDeducting_reason(),f.getUtc()));
+ mArrayList.add(new ScoreBean(f.getScore_deducting(), f.getItem_content(), f.getDeducting_reason(),f.getUtc(),f.getEmp_id()));
item_conents.add(f.getItem_content());
Collections.sort(mArrayList);
mScoreAdapter.addDatas(mArrayList);
diff --git a/app/src/main/res/layout/layout_score_item.xml b/app/src/main/res/layout/layout_score_item.xml
index 87df477..7a2473e 100644
--- a/app/src/main/res/layout/layout_score_item.xml
+++ b/app/src/main/res/layout/layout_score_item.xml
@@ -4,6 +4,24 @@
android:layout_height="40dp"
android:background="@drawable/stu_score_title"
>
+ <TextView
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:layout_height="match_parent"
+ android:textColor="@android:color/white"
+ android:gravity="center"
+ android:id="@+id/tv_item_time"
+ style="@style/ui_exam_font"
+ android:text="鎵ｅ垎鏃堕棿"/>
+ <TextView
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:layout_height="match_parent"
+ android:textColor="@android:color/white"
+ android:gravity="center"
+ android:id="@+id/tv_item_code"
+ style="@style/ui_exam_font"
+ android:text="椤圭洰缂栧彿"/>
<TextView
android:layout_width="0dp"
android:layout_weight="1"
diff --git a/app/src/main/res/layout/layout_score_item_title.xml b/app/src/main/res/layout/layout_score_item_title.xml
index 8f1cc9c..4d73af3 100644
--- a/app/src/main/res/layout/layout_score_item_title.xml
+++ b/app/src/main/res/layout/layout_score_item_title.xml
@@ -6,6 +6,43 @@
android:background="@drawable/stu_score_title"
>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_weight="1"
+
+ android:layout_height="match_parent"
+ android:textColor="@android:color/white"
+ android:gravity="center_vertical"
+ android:paddingLeft="90dp"
+ android:drawablePadding="5dp"
+ android:id="@+id/tv_item_time"
+ android:textSize="@dimen/network_train_textsize22px"
+ android:drawableLeft="@mipmap/duobianxing"
+ android:text="鎵ｅ垎鏃堕棿"/>
+ <View android:layout_height="match_parent"
+ android:layout_width="1px"
+ android:background="#2B3141"
+
+ />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_weight="1"
+
+ android:layout_height="match_parent"
+ android:textColor="@android:color/white"
+ android:gravity="center_vertical"
+ android:paddingLeft="90dp"
+ android:drawablePadding="5dp"
+ android:id="@+id/tv_item_code"
+ android:textSize="@dimen/network_train_textsize22px"
+ android:drawableLeft="@mipmap/duobianxing"
+ android:text="椤圭洰缂栧彿"/>
+ <View android:layout_height="match_parent"
+ android:layout_width="1px"
+ android:background="#2B3141"
+
+ />
<TextView
android:layout_width="wrap_content"
android:layout_weight="1"
--
Gitblit v1.8.0