endian11
2019-03-19 04f18ba142aeaf04284194e347435504fd377cd4
完善考试界面 增加扣分项目表
6个文件已修改
7个文件已添加
301 ■■■■■ 已修改文件
app/src/main/java/safeluck/drive/evaluation/adapter/ScoreAdapter.java 102 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/bean/ScoreBean.java 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/drawable/antenna.png 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/drawable/antenna_red.png 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/drawable/header.jpg 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/layout_net_train.xml 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/layout_score_item.xml 41 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/layout_stu_score.xml 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/layout_train_exit.xml 30 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/layout_train_fragment.xml 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/profile_layout.xml 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/values/colors.xml 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/adapter/ScoreAdapter.java
New file
@@ -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);
        }
    }
}
app/src/main/java/safeluck/drive/evaluation/bean/ScoreBean.java
New file
@@ -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;
    }
}
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);
    }
}
app/src/main/res/drawable/antenna.png
app/src/main/res/drawable/antenna_red.png
app/src/main/res/drawable/header.jpg
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>
app/src/main/res/layout/layout_score_item.xml
New file
@@ -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>
app/src/main/res/layout/layout_stu_score.xml
New file
@@ -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>
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>
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>
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>
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>