From 04f18ba142aeaf04284194e347435504fd377cd4 Mon Sep 17 00:00:00 2001
From: endian11 <Dana_Lee1016@126.com>
Date: 星期二, 19 三月 2019 15:19:03 +0800
Subject: [PATCH] 完善考试界面 增加扣分项目表
---
app/src/main/java/safeluck/drive/evaluation/adapter/ScoreAdapter.java | 102 +++++++++++++++++
app/src/main/res/layout/layout_score_item.xml | 41 ++++++
app/src/main/res/drawable/antenna_red.png | 0
app/src/main/res/values/colors.xml | 2
app/src/main/res/layout/layout_train_exit.xml | 30 ++++
app/src/main/java/safeluck/drive/evaluation/bean/ScoreBean.java | 47 +++++++
app/src/main/res/layout/layout_stu_score.xml | 10 +
app/src/main/res/layout/layout_train_fragment.xml | 3
app/src/main/res/drawable/antenna.png | 0
app/src/main/res/layout/layout_net_train.xml | 10 +
app/src/main/res/layout/profile_layout.xml | 24 ++-
app/src/main/res/drawable/header.jpg | 0
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java | 32 +++++
13 files changed, 281 insertions(+), 20 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
new file mode 100644
index 0000000..9192339
--- /dev/null
+++ b/app/src/main/java/safeluck/drive/evaluation/adapter/ScoreAdapter.java
@@ -0,0 +1,102 @@
+package safeluck.drive.evaluation.adapter;
+
+import android.content.Context;
+import android.graphics.Color;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import safeluck.drive.evaluation.R;
+import safeluck.drive.evaluation.bean.ScoreBean;
+
+/**
+ * MyApplication2
+ * Created by lzw on 2019/3/19. 14:16:10
+ * 閭锛�632393724@qq.com
+ * All Rights Saved! Chongqing AnYun Tech co. LTD
+ */
+public class ScoreAdapter extends BaseAdapter {
+
+ private Context mContext;
+ private List<ScoreBean> mArrayList = new ArrayList<>();
+
+
+ public ScoreAdapter(Context mContext) {
+ this.mContext = mContext;
+ }
+
+ /**
+ * 涓�娆℃坊鍔犳墍鏈夋暟鎹�
+ * @param scoreBeans
+ */
+ public void addDatas(List<ScoreBean> scoreBeans){
+ mArrayList.clear();
+ mArrayList.addAll(scoreBeans);
+ notifyDataSetChanged();
+ }
+
+
+ public void addItem(ScoreBean scoreBean){
+ mArrayList.add(scoreBean);
+ notifyDataSetChanged();
+ }
+
+ @Override
+ public int getCount() {
+ return mArrayList.size();
+ }
+
+ @Override
+ public ScoreBean getItem(int position) {
+ return mArrayList.get(position);
+ }
+
+ @Override
+ public long getItemId(int position) {
+ return position;
+ }
+
+ @Override
+ public View getView(int position, View convertView, ViewGroup parent) {
+ DataHodler dataHodler = null;
+ if (convertView == null){
+ convertView =LayoutInflater.from(mContext).inflate(R.layout.layout_score_item,parent,false);
+ dataHodler = new DataHodler(convertView);
+ convertView.setTag(dataHodler);
+ }else{
+ dataHodler = (DataHodler) convertView.getTag();
+ }
+ if (getItemId(position) %2 == 0){
+ convertView.setBackgroundColor(Color.parseColor("#67a8bc"));
+ }else{
+ convertView.setBackgroundColor(mContext.getResources().getColor(R.color.train_bg));
+ }
+ ScoreBean scoreBean = getItem(position);
+ dataHodler.tv_item.setTextColor(Color.parseColor("#0e0cca"));
+ dataHodler.tv_item.setText(scoreBean.getmItem());
+
+ dataHodler.tv_score.setTextColor(Color.parseColor("#0e0cca"));
+ dataHodler.tv_score.setText(String.valueOf(scoreBean.getmScore()));
+ dataHodler.tv_reason.setTextColor(Color.parseColor("#0e0cca"));
+ dataHodler.tv_reason.setText(scoreBean.getReason());
+ return convertView;
+ }
+
+ private static class DataHodler {
+ TextView tv_score;
+ TextView tv_reason;
+ TextView tv_item;
+
+ 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);
+ }
+ }
+}
diff --git a/app/src/main/java/safeluck/drive/evaluation/bean/ScoreBean.java b/app/src/main/java/safeluck/drive/evaluation/bean/ScoreBean.java
new file mode 100644
index 0000000..01d516a
--- /dev/null
+++ b/app/src/main/java/safeluck/drive/evaluation/bean/ScoreBean.java
@@ -0,0 +1,47 @@
+package safeluck.drive.evaluation.bean;
+
+/**
+ * MyApplication2
+ * Created by lzw on 2019/3/19. 14:17:11
+ * 閭锛�632393724@qq.com
+ * All Rights Saved! Chongqing AnYun Tech co. LTD
+ */
+public class ScoreBean {
+ /**鎵ｅ垎鍒嗘暟*/
+ private float mScore;
+ /**鎵ｅ垎椤圭洰*/
+ private String mItem;
+ /**鎵ｅ垎鍘熷洜*/
+ private String reason;
+
+
+ public ScoreBean(float mScore, String mItem, String reason) {
+ this.mScore = mScore;
+ this.mItem = mItem;
+ this.reason = reason;
+ }
+
+ public float getmScore() {
+ return mScore;
+ }
+
+ public void setmScore(float mScore) {
+ this.mScore = mScore;
+ }
+
+ public String getmItem() {
+ return mItem;
+ }
+
+ public void setmItem(String mItem) {
+ this.mItem = mItem;
+ }
+
+ public String getReason() {
+ return reason;
+ }
+
+ public void setReason(String reason) {
+ this.reason = reason;
+ }
+}
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 513b24d..fc7981f 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
@@ -1,14 +1,22 @@
package safeluck.drive.evaluation.fragment;
import android.os.Bundle;
+import android.os.Handler;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import android.widget.ListView;
+
+
+import java.util.ArrayList;
+import java.util.List;
import me.yokeyword.fragmentation.SupportFragment;
import safeluck.drive.evaluation.R;
+import safeluck.drive.evaluation.adapter.ScoreAdapter;
+import safeluck.drive.evaluation.bean.ScoreBean;
/**
* MyApplication2
@@ -17,6 +25,12 @@
* All Rights Saved! Chongqing AnYun Tech co. LTD
*/
public class NetWorkTrainFragment extends SupportFragment {
+
+ private ListView mListView ;
+ private ScoreAdapter mScoreAdapter;
+
+ private List<ScoreBean> mArrayList = new ArrayList<>();
+
public static SupportFragment newInstance() {
return new NetWorkTrainFragment();
}
@@ -24,7 +38,23 @@
@Nullable
@Override
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
- View view = inflater.inflate(R.layout.layout_net_train,container,false);
+ View view = inflater.inflate(R.layout.layout_stu_score,container,false);
+ initView(view);
return view;
}
+
+ private void initView(View view) {
+ mListView = view.findViewById(R.id.lv);
+ mScoreAdapter = new ScoreAdapter(_mActivity);
+ 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,"鍧￠亾璧锋","涓�娆＄唲鐏�"));
+ mArrayList.add(new ScoreBean(0,"",""));
+ mArrayList.add(new ScoreBean(0,"",""));
+
+ mScoreAdapter.addDatas(mArrayList);
+
+ }
}
diff --git a/app/src/main/res/drawable/antenna.png b/app/src/main/res/drawable/antenna.png
new file mode 100644
index 0000000..8a96dfc
--- /dev/null
+++ b/app/src/main/res/drawable/antenna.png
Binary files differ
diff --git a/app/src/main/res/drawable/antenna_red.png b/app/src/main/res/drawable/antenna_red.png
new file mode 100644
index 0000000..88d8282
--- /dev/null
+++ b/app/src/main/res/drawable/antenna_red.png
Binary files differ
diff --git a/app/src/main/res/drawable/header.jpg b/app/src/main/res/drawable/header.jpg
new file mode 100644
index 0000000..77c722e
--- /dev/null
+++ b/app/src/main/res/drawable/header.jpg
Binary files differ
diff --git a/app/src/main/res/layout/layout_net_train.xml b/app/src/main/res/layout/layout_net_train.xml
index 9b6ebb9..79bf1ea 100644
--- a/app/src/main/res/layout/layout_net_train.xml
+++ b/app/src/main/res/layout/layout_net_train.xml
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
+ android:layout_height="match_parent" android:orientation="horizontal">
<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
+ android:layout_width="0dp"
+ android:layout_weight="4"
android:layout_height="match_parent"
android:padding="5dp"
android:gravity="center"
@@ -41,9 +44,12 @@
android:text="鍛煎彨璇锋眰"
android:textColor="@android:color/white"
android:padding="10dp"
- android:layout_marginBottom="2dp"
+
android:background="@color/colorAccent"
android:layout_toRightOf="@+id/tv_pos"/>
</RelativeLayout>
<include layout="@layout/layout_net_train_item"/>
+</LinearLayout>
+
+ <include android:layout_gravity="center_vertical" android:layout_marginLeft="10dp" android:layout_width="0dp" android:layout_weight="1" android:layout_height="match_parent" layout="@layout/layout_train_exit"/>
</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_score_item.xml b/app/src/main/res/layout/layout_score_item.xml
new file mode 100644
index 0000000..b8a2dfe
--- /dev/null
+++ b/app/src/main/res/layout/layout_score_item.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="40dp"
+ android:background="@color/train_bg"
+>
+<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"
+ android:text="鎵ｅ垎椤圭洰"/>
+ <View android:layout_height="match_parent"
+ android:layout_width="1px"
+ android:background="#66CCFF"
+
+ />
+ <TextView
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:layout_height="match_parent"
+ android:gravity="center"
+ android:textColor="@android:color/white"
+ android:id="@+id/tv_score"
+ android:text="鎵ｅ垎鍒嗘暟"/>
+ <View android:layout_height="match_parent"
+ android:layout_width="1px"
+ android:background="#66CCFF"
+
+ />
+ <TextView
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:textColor="@android:color/white"
+ android:layout_height="match_parent"
+ android:gravity="center"
+ android:id="@+id/tv_reason"
+ android:text="鎵ｅ垎鍘熷洜"/>
+</LinearLayout>
diff --git a/app/src/main/res/layout/layout_stu_score.xml b/app/src/main/res/layout/layout_stu_score.xml
new file mode 100644
index 0000000..ba23bfd
--- /dev/null
+++ b/app/src/main/res/layout/layout_stu_score.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+<ListView
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:id="@+id/lv"></ListView>
+</RelativeLayout>
diff --git a/app/src/main/res/layout/layout_train_exit.xml b/app/src/main/res/layout/layout_train_exit.xml
index f9504c9..00ed465 100644
--- a/app/src/main/res/layout/layout_train_exit.xml
+++ b/app/src/main/res/layout/layout_train_exit.xml
@@ -1,6 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="match_parent">
-
-</LinearLayout>
+ android:background="@color/train_bg"
+ android:layout_height="match_parent"
+ android:gravity="center"
+ android:padding="5dp"
+ android:orientation="vertical">
+<Button
+ android:layout_width="110dp"
+ android:layout_height="wrap_content"
+ android:text="杩斿洖"
+ android:padding="10dp"
+ android:textSize="20sp"
+ android:id="@+id/btn_return"
+ android:textColor="@android:color/white"
+ android:background="@color/train_btn_return"/>
+ <Button
+ android:layout_width="110dp"
+ android:layout_height="wrap_content"
+ android:background="@android:color/holo_red_dark"
+ android:layout_marginTop="10dp"
+ android:textSize="20sp"
+ android:layout_below="@+id/btn_return"
+ android:padding="10dp"
+ android:textColor="@android:color/white"
+ android:text="寮�濮嬭缁�"/>
+</RelativeLayout>
diff --git a/app/src/main/res/layout/layout_train_fragment.xml b/app/src/main/res/layout/layout_train_fragment.xml
index 5d0638b..04a9e57 100644
--- a/app/src/main/res/layout/layout_train_fragment.xml
+++ b/app/src/main/res/layout/layout_train_fragment.xml
@@ -5,6 +5,5 @@
android:orientation="vertical"
android:background="@color/home_bg_color">
<include android:layout_marginBottom="10dp" android:layout_weight="1" android:layout_width="match_parent" android:layout_height="0dp" android:id="@+id/profile" layout="@layout/profile_layout"/>
-<include android:layout_marginBottom="10dp" android:layout_weight="1" android:layout_width="match_parent" android:layout_height="0dp" android:id="@+id/profile" layout="@layout/profile_layout"/>
-<include android:layout_marginBottom="10dp" android:layout_weight="1" android:layout_width="match_parent" android:layout_height="0dp" android:id="@+id/profile" layout="@layout/layout_net_train"/>
+<include android:layout_marginBottom="10dp" android:layout_weight="1.5" android:layout_width="match_parent" android:layout_height="0dp" android:id="@+id/profile" layout="@layout/layout_net_train"/>
</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/profile_layout.xml b/app/src/main/res/layout/profile_layout.xml
index ce9adec..9bc183f 100644
--- a/app/src/main/res/layout/profile_layout.xml
+++ b/app/src/main/res/layout/profile_layout.xml
@@ -2,10 +2,10 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/colorAccent"
+ android:background="@color/profile_bg"
android:gravity="center"
android:orientation="horizontal"
- android:padding="10dp">
+ android:padding="5dp">
<ImageView
android:id="@+id/iv_head"
@@ -37,7 +37,7 @@
android:layout_toRightOf="@+id/iv_head"
android:layout_weight="1"
android:text="濮撳悕:lizanwei"
- android:textColor="@color/colorPrimary" />
+ android:textColor="@android:color/white" />
<TextView
android:id="@+id/tv_sex"
@@ -48,7 +48,7 @@
android:layout_toRightOf="@+id/tv_name"
android:layout_weight="1"
android:text="鎬у埆:鐢�"
- android:textColor="@color/colorPrimary" />
+ android:textColor="@android:color/white"/>
<TextView
android:layout_width="wrap_content"
@@ -56,7 +56,7 @@
android:layout_toRightOf="@+id/tv_sex"
android:layout_weight="1"
android:text="鐢靛瓙鏁欑粌:楂樼骇"
- android:textColor="@color/colorPrimary" />
+ android:textColor="@android:color/white" />
</LinearLayout>
<LinearLayout
@@ -74,7 +74,7 @@
android:layout_below="@+id/tv_name"
android:layout_weight="1"
android:text="@string/user_id"
- android:textColor="@color/colorPrimary" />
+ android:textColor="@android:color/white" />
<TextView
android:id="@+id/inspect"
@@ -82,7 +82,7 @@
android:layout_weight="1"
android:layout_height="wrap_content"
android:text="@string/inspector"
- android:textColor="@color/colorPrimary" />
+ android:textColor="@android:color/white"/>
</LinearLayout>
<LinearLayout
@@ -97,7 +97,7 @@
android:layout_height="wrap_content"
android:text="寮�濮嬫椂闂达細"
android:layout_weight="1"
- android:textColor="@color/colorPrimary" />
+ android:textColor="@android:color/white"/>
<TextView
@@ -108,7 +108,7 @@
android:text="鐢ㄦ椂:"
- android:textColor="@color/colorPrimary" />
+ android:textColor="@android:color/white" />
<TextView
android:id="@+id/view_map"
@@ -116,7 +116,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="鏌ョ湅鍦板浘"
- android:textColor="@color/colorPrimary" />
+ android:textColor="@android:color/white"/>
</LinearLayout>
</LinearLayout>
@@ -135,7 +135,7 @@
android:layout_height="0dp"
android:layout_weight="1"
- android:src="@drawable/wheel" />
+ android:src="@drawable/antenna" />
<TextView
android:layout_width="wrap_content"
@@ -143,6 +143,7 @@
android:layout_weight="1"
android:layout_marginBottom="5dp"
android:layout_marginTop="5dp"
+ android:textColor="@android:color/white"
android:background="@android:color/holo_green_dark"
android:padding="5dp"
android:text="100" />
@@ -151,6 +152,7 @@
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="1"
+ android:textColor="@android:color/white"
android:text="褰撳墠寰楀垎" />
</LinearLayout>
</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index c3574af..f65ffa3 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -9,4 +9,6 @@
<color name="home_version_show">#b47242</color>
<color name="train_item_bg">#6a75be</color>
<color name="train_bg">#4aabb2</color>
+ <color name="train_btn_return">#16aa3c</color>
+ <color name="profile_bg">#1988a3</color>
</resources>
--
Gitblit v1.8.0