lizhanwei
2020-04-21 705d8e58aa6f13bf6883a7116c7de0edfa1567a6
修改联网考试细节ui;基本完成参数设置界面
2个文件已删除
7个文件已修改
2个文件已添加
382 ■■■■ 已修改文件
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java 117 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/fragment/SetArgumentsFragment.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java 77 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/drawable/btn_bg_baseset.png 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/drawable/btn_bg_baseset.xml 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/drawable/ic_btn_daikao.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/drawable/set_arg_et_drawable.xml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/layout_base_datas.xml 133 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/layout_train_exit.xml 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/profile_layout.xml 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/values/dimens.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
@@ -1,12 +1,17 @@
package safeluck.drive.evaluation.fragment;
import android.content.Context;
import android.graphics.Color;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.text.SpannableString;
import android.text.Spanned;
import android.text.TextUtils;
import android.text.style.AbsoluteSizeSpan;
import android.text.style.ForegroundColorSpan;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.MotionEvent;
@@ -86,10 +91,9 @@
    private ListView mListView;
    private Button btn_start_exam;
    private TextView tv_stop;//呼叫请求(结束考试)
    private Gson gson = new Gson();
    private ScoreAdapter mScoreAdapter;
    private ArrowView av_zhijiao, av_curve, av_park, av_podao;
    private HouseView houseView;
    private Button av_zhijiao, av_curve, av_park, av_podao;
    private Button houseView;
    private List<ExamStatus> examStatusList = new ArrayList<>();
    private List<String> item_conents = new ArrayList<>();//坡道定点停车和起步
    private int changKaoCount=0;
@@ -122,12 +126,12 @@
        public boolean handleMessage(Message msg) {
            if (msg.what == ADD_DATA){
                MyLog.i("handler add_data totalScore="+currTotalScore);
                tv_total_score.setText(getResources().getString(R.string.total_score,currTotalScore));
                houseView.setColor(aaa(safeluck.drive.evaluation.DB.Constant.EXAM_MAP_TYPE_REVERSE));//倒车入库 type =1
                av_podao.setColor(aaa(safeluck.drive.evaluation.DB.Constant.EXAM_MAP_TYPE_RAMP));
                av_park.setColor(aaa(safeluck.drive.evaluation.DB.Constant.EXAM_MAP_TYPE_PARK));
                av_curve.setColor(aaa(safeluck.drive.evaluation.DB.Constant.EXAM_MAP_TYPE_CURVE));
                av_zhijiao.setColor(aaa(safeluck.drive.evaluation.DB.Constant.EXAM_MAP_TYPE_ANGLE));
                setTotalScoreText();
                houseView.setBackground(aaa(safeluck.drive.evaluation.DB.Constant.EXAM_MAP_TYPE_REVERSE));//倒车入库 type =1
                av_podao.setBackground(aaa(safeluck.drive.evaluation.DB.Constant.EXAM_MAP_TYPE_RAMP));
                av_park.setBackground(aaa(safeluck.drive.evaluation.DB.Constant.EXAM_MAP_TYPE_PARK));
                av_curve.setBackground(aaa(safeluck.drive.evaluation.DB.Constant.EXAM_MAP_TYPE_CURVE));
                av_zhijiao.setBackground(aaa(safeluck.drive.evaluation.DB.Constant.EXAM_MAP_TYPE_ANGLE));
                for (int i = 0; i < btn_ids.size(); i++) {
                    int viewId = getResources().getIdentifier(String.valueOf(btn_ids.get(i)),"id",_mActivity.getPackageName());
@@ -163,27 +167,27 @@
        }
    });
    private int aaa(int type) {
    private Drawable aaa(int type) {
        if (examStatusList!=null &&examStatusList.size()>0){
            for (ExamStatus examStatus:
                 examStatusList) {
                    examStatusList) {
                if (type == examStatus.getMap_item()){
                    if (examStatus.getEnter() == safeluck.drive.evaluation.DB.Constant.BEGIN_ITEM){
                        //进入考场
                        if (examStatusList.get(0).getStartExam() == Constant.NONE_BEEN_START_EXAM){
                            //结束考试了
                            MyLog.i("进入考场结束考试,startexam="+examStatus.getStartExam());
                            return getResources().getColor(R.color.colorAccent);
                            return getResources().getDrawable(R.drawable.ic_btn_fail);
                        }else{
                            MyLog.i("进入考场,type="+type);
                            return getResources().getColor(R.color.pink);
                            return getResources().getDrawable(R.drawable.ic_btn_examing);
                        }
                    }else if (examStatus.getEnter() == safeluck.drive.evaluation.DB.Constant.FINISH_ITEM){
                        if (examStatusList.get(0).getStartExam()==Constant.NONE_BEEN_START_EXAM){
                            return getResources().getColor(R.color.examing);
                            return getResources().getDrawable(R.drawable.ic_btn_daikao);
                        }
                        switch (type) {
@@ -191,7 +195,7 @@
                                if (item_conents.contains("倒车入库")) {
                                    MyLog.i("该项考试失败,type="+type);
                                    return getResources().getColor(R.color.colorAccent);
                                    return getResources().getDrawable(R.drawable.ic_btn_fail);
                                }else{
                                    if (examStatus.getResult() ==1){
                                        MyLog.i("已经播放过倒车入库合格");
@@ -200,12 +204,12 @@
                                        examStatusViewModel.updateItemExamResult(1,examStatus.getMap_id());
                                    }
                                    return getResources().getColor(R.color.train_btn_return);
                                    return getResources().getDrawable(R.drawable.ic_btn_succ);
                                }
                            case 2:
                                if (item_conents.contains("坡道定点停车和起步")) {
                                    MyLog.i("该项考试失败,type="+type);
                                    return getResources().getColor(R.color.colorAccent);
                                    return getResources().getDrawable(R.drawable.ic_btn_fail);
                                }else{
                                    if (examStatus.getResult() ==1){
                                        MyLog.i("已经播放过坡道定点停车和起步合格合格");
@@ -214,12 +218,12 @@
                                        examStatusViewModel.updateItemExamResult(1,examStatus.getMap_id());
                                    }
                                    return getResources().getColor(R.color.train_btn_return);
                                    return getResources().getDrawable(R.drawable.ic_btn_succ);
                                }
                            case 3:
                                if (item_conents.contains("侧方停车")) {
                                    MyLog.i("该项考试失败,type="+type);
                                    return getResources().getColor(R.color.colorAccent);
                                    return getResources().getDrawable(R.drawable.ic_btn_fail);
                                }else{
                                    if (examStatus.getResult() ==1){
                                        MyLog.i("已经播放过侧方停车合格");
@@ -228,12 +232,12 @@
                                        ExamPlatformData.getInstance().getTTS().speak("侧方停车合格");
                                        examStatusViewModel.updateItemExamResult(1,examStatus.getMap_id());
                                    }
                                    return getResources().getColor(R.color.train_btn_return);
                                    return getResources().getDrawable(R.drawable.ic_btn_succ);
                                }
                            case 4:
                                if (item_conents.contains("曲线行驶")) {
                                    MyLog.i("该项考试失败,type="+type);
                                    return getResources().getColor(R.color.colorAccent);
                                    return getResources().getDrawable(R.drawable.ic_btn_fail);
                                }else{
                                    if (examStatus.getResult() ==1){
                                        MyLog.i("已经播放过曲线行驶合格");
@@ -242,12 +246,12 @@
                                        ExamPlatformData.getInstance().getTTS().speak("曲线行驶合格");
                                        examStatusViewModel.updateItemExamResult(1,examStatus.getMap_id());
                                    }
                                    return getResources().getColor(R.color.train_btn_return);
                                    return getResources().getDrawable(R.drawable.ic_btn_succ);
                                }
                            case 5:
                                if (item_conents.contains("直角转弯")) {
                                    MyLog.i("该项考试失败,type="+type);
                                    return getResources().getColor(R.color.colorAccent);
                                    return getResources().getDrawable(R.drawable.ic_btn_fail);
                                }else{
                                    if (examStatus.getResult() ==1){
                                        MyLog.i("已经播放过直角转弯合格");
@@ -256,7 +260,7 @@
                                        examStatusViewModel.updateItemExamResult(1,examStatus.getMap_id());
                                    }
                                    return getResources().getColor(R.color.train_btn_return);
                                    return getResources().getDrawable(R.drawable.ic_btn_succ);
                                }
@@ -264,13 +268,14 @@
                        }
                    }else{
                        return getResources().getColor(R.color.examing);
                        return getResources().getDrawable(R.drawable.ic_btn_daikao);
                    }
                }
            }
        }
        return getResources().getColor(R.color.examing);
        return getResources().getDrawable(R.drawable.ic_btn_daikao);
    }
    /**
     * 路考项目 每个项目的颜色变化
     * @param type
@@ -463,12 +468,10 @@
                    examStatusList.addAll(examStatus);
                    mHandler.obtainMessage(ADD_DATA).sendToTarget();
                    if (examStatus.get(0).getStartExam() != Constant.NONE_BEEN_START_EXAM){
                        btn_start_exam.setEnabled(false);
                        tv_stop.setEnabled(true);
                        btn_start_exam.setText("结束考试");
                        iv_head.getDrawable().setLevel(1);
                    }else{
                        btn_start_exam.setEnabled(true);
                        tv_stop.setEnabled(false);
                        btn_start_exam.setText("开始考试");
                        iv_head.getDrawable().setLevel(0);
                    }
                    exam_type = examStatus.get(0).getStartExam();
@@ -541,6 +544,7 @@
        btn_ids.add(R.id.btn_10);
        view.findViewById(R.id.iv_head).setOnClickListener(this);
        ((TextView)view.findViewById(R.id.tv_score_tip)).setText("当前考试得分");
        av_curve = view.findViewById(R.id.av3);
        av_park = view.findViewById(R.id.av2);
        av_podao = view.findViewById(R.id.av1);
@@ -598,36 +602,37 @@
    public void onClick(View v) {
        switch (v.getId()) {
            case R.id.btn_start:
                clearArrayListResetTotalScore();
                if (btn_start_exam.getText().toString().equalsIgnoreCase("开始考试")){
                    clearArrayListResetTotalScore();
                if (myDialogFragment == null){
                    myDialogFragment = new MyDialogFragment();
                    if (myDialogFragment == null){
                        myDialogFragment = new MyDialogFragment();
                    }
                    myDialogFragment.show(getFragmentManager(),"dialog");
                    myDialogFragment.setCallback(new MyDialogFragment.Callback() {
                        @Override
                        public void changKao() {
                            sendJK0202(2);
                        }
                        @Override
                        public void luKao() {
                            sendJK0202(3);
                        }
                    });
                }else{
                    stopExam();
                }
                myDialogFragment.show(getFragmentManager(),"dialog");
                myDialogFragment.setCallback(new MyDialogFragment.Callback() {
                    @Override
                    public void changKao() {
                        sendJK0202(2);
                    }
                    @Override
                    public void luKao() {
                        sendJK0202(3);
                    }
                });
                break;
            case R.id.tv_stop:
                Toast.makeText(_mActivity, "结束考试", Toast.LENGTH_SHORT).show();
                stopExam();
                break;
            case R.id.view_map:
                if (ExamPlatformData.getInstance().getExamType()>ExamPlatformData.EXAM_TYPE_ChangKAO){
                    RoadDriveMapFragmentaa mapFragment = findFragment(RoadDriveMapFragmentaa.class);
@@ -717,7 +722,7 @@
        item_id = 0;
        failedProjViewModel.deleteAll();
        tv_total_score.setText(String.valueOf(currTotalScore));
        setTotalScoreText();
        ExamPlatformData.getInstance().getTTS().speak("结束考试");
@@ -764,5 +769,13 @@
        CEventCenter.onBindEvent(false,icEventListener,Constant.BIND_SPEED_TOPIC);
    }
    private void setTotalScoreText() {
        String totalstr=String.format(getString(R.string.total_score),currTotalScore);
        SpannableString msp = new SpannableString(totalstr);
        msp.setSpan(new ForegroundColorSpan(Color.parseColor("#A1A1A3")),totalstr.length()-1,totalstr.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
        msp.setSpan(new AbsoluteSizeSpan(13),totalstr.length()-1,totalstr.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
        tv_total_score.setText(msp);
    }
}
app/src/main/java/safeluck/drive/evaluation/fragment/SetArgumentsFragment.java
@@ -152,6 +152,7 @@
//        });
//        toolbar.setTitle("设置参数");
        view.findViewById(R.id.btn_save_platform).setOnClickListener(this);
        view.findViewById(R.id.btn_return).setOnClickListener(this);
        et_ip = view.findViewById(R.id.et_platform_ip);
        et_port = view.findViewById(R.id.et_platform_port);
        et_ip.setText(ExamPlatformData.getInstance().getPlatformIP());
@@ -251,6 +252,8 @@
                request_code = REQUEST_CODE_ROADMAP;
                openFileMgr();
                break;
            case R.id.btn_return:
                _mActivity.onBackPressed();
            default:
                break;
        }
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
@@ -95,7 +95,6 @@
    private Button btn_start_exam;
    private Button btn_return;
    private TextView tv_stop;//呼叫请求(结束考试)
    private Gson gson = new Gson();
    private ScoreAdapter mScoreAdapter;
    private Button av_zhijiao, av_curve, av_park, av_podao;
    private Button houseView;
@@ -456,13 +455,11 @@
                    examStatusList.addAll(examStatus);
                    mHandler.obtainMessage(ADD_DATA).sendToTarget();
                    if (examStatus.get(0).getStartExam() != Constant.NONE_BEEN_START_EXAM){
//                        btn_start_exam.setEnabled(false);
                        tv_stop.setEnabled(true);
                        btn_start_exam.setText("结束训练");
                        iv_head.getDrawable().setLevel(1);
                    }else{
//                        btn_start_exam.setEnabled(true);
                        tv_stop.setEnabled(false);
                        iv_head.getDrawable().setLevel(0);
                        btn_start_exam.setText("开始训练");
                    }
                    exam_type = examStatus.get(0).getStartExam();
                }
@@ -584,9 +581,9 @@
        view.findViewById(R.id.view_map).setOnClickListener(this);
        mScoreAdapter = new ScoreAdapter(_mActivity);
        mListView.setAdapter(mScoreAdapter);
//        btn_start_exam = view.findViewById(R.id.btn_start);
//        btn_start_exam.setText("开始训练");
//        btn_start_exam.setOnClickListener(this);
        btn_start_exam = view.findViewById(R.id.btn_start);
        btn_start_exam.setText("开始训练");
        btn_start_exam.setOnClickListener(this);
        tv_stop = view.findViewById(R.id.tv_stop);
        tv_stop.setText("结束训练");
        tv_stop.setOnClickListener(this);
@@ -595,49 +592,45 @@
    MyDialogFragment myDialogFragment;
    SimulateNightBean simulateNightBean = null;
    @Override
    public void onClick(View v) {
        switch (v.getId()) {
//            case R.id.btn_start:
//
            case R.id.btn_start:
//                //TODO 发送JKMessage0202 给平台,开始考试
//                final JKMessage0202 jkMessage0202 = new JKMessage0202();
//                Date date = new Date();
//                wokViewModel.updateBeginTime(date.getTime());
//                jkMessage0202.timeBCD = date;
//                ExamPlatformData.getInstance().setExam_id(Utils.parseUnsignedInt(String.valueOf(date.getTime()/1000),10));
//                if (myDialogFragment == null){
//                    myDialogFragment = new MyDialogFragment();
//                }
//                myDialogFragment.show(getFragmentManager(),"dialog");
//                myDialogFragment.setCallback(new MyDialogFragment.Callback() {
//                    @Override
//                    public void changKao() {
//
//                        sendJK0202(2);
//                    }
//
//                    @Override
//                    public void luKao() {
//                        sendJK0202(3);
//
//
//
//                    }
//                });
                if (btn_start_exam.getText().toString().equalsIgnoreCase("开始训练")){
                    final JKMessage0202 jkMessage0202 = new JKMessage0202();
                    Date date = new Date();
                    wokViewModel.updateBeginTime(date.getTime());
                    jkMessage0202.timeBCD = date;
                    ExamPlatformData.getInstance().setExam_id(Utils.parseUnsignedInt(String.valueOf(date.getTime()/1000),10));
                    if (myDialogFragment == null){
                        myDialogFragment = new MyDialogFragment();
                    }
                    myDialogFragment.show(getFragmentManager(),"dialog");
                    myDialogFragment.setCallback(new MyDialogFragment.Callback() {
                        @Override
                        public void changKao() {
                            sendJK0202(2);
                        }
                        @Override
                        public void luKao() {
                            sendJK0202(3);
                        }
                    });
                }else{
                    stopExam();
                }
//                break;
            case R.id.tv_stop:
                Toast.makeText(_mActivity, "结束考试", Toast.LENGTH_SHORT).show();
                stopExam();
                break;
            case R.id.view_map:
                if (ExamPlatformData.getInstance().getExamType()>ExamPlatformData.EXAM_TYPE_ChangKAO){
                    RoadDriveMapFragmentaa mapFragment = findFragment(RoadDriveMapFragmentaa.class);
@@ -656,11 +649,7 @@
                }
                break;
            case R.id.btn_return:
//                _mActivity.onBackPressed();
                Log.i(TAG,"screenWidth="+ DimenUtil.getScreenWidth(_mActivity));
                Log.i(TAG,"screenHeight="+ DimenUtil.getScreenHeight(_mActivity));
                Log.i(TAG,"18px font ="+ DimenUtil.px2sp(_mActivity,18));
                Log.i(TAG,"48px dp ="+ DimenUtil.px2dp(_mActivity,48));
                _mActivity.onBackPressed();
                break;
            case R.id.iv_head:
                MyLog.i(TAG,"签到,获取身份证物理卡号");
app/src/main/res/drawable/btn_bg_baseset.png
Binary files differ
app/src/main/res/drawable/btn_bg_baseset.xml
New file
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
    android:shape="rectangle">
    <solid android:color="#ff2b3141" />
    <stroke android:width="1dp" android:color="#591e5095" />
    <corners android:radius="26dp"/>
</shape>
app/src/main/res/drawable/ic_btn_daikao.xml
@@ -5,5 +5,5 @@
    android:viewportHeight="1024">
    <path
        android:pathData="M0,0m115.86,0l955.85,0q115.86,0 115.86,115.86l0,738.61q0,115.86 -115.86,115.86l-955.85,0q-115.86,0 -115.86,-115.86l0,-738.61q0,-115.86 115.86,-115.86Z"
        android:fillColor="#1E4A89"/>
        android:fillColor="#187558"/>
</vector>
app/src/main/res/drawable/set_arg_et_drawable.xml
New file
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
    android:shape="rectangle">
    <solid android:color="#ff2b3141" />
    <corners android:radius="7dp"/>
</shape>
app/src/main/res/layout/layout_base_datas.xml
@@ -1,21 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
<RelativeLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="match_parent">
<!--    <include layout="@layout/toolbar"/>-->
<!--    <ScrollView-->
<!--        android:layout_height="match_parent" android:layout_width="match_parent"-->
<!--        >-->
    <Button
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:id="@+id/btn_save_platform"
        android:textColor="@android:color/white"
        android:textSize="@dimen/network_train_textsize24px"
        android:background="@drawable/btn_state_save"
        android:layout_alignParentEnd="true"
        android:layout_marginRight="@dimen/ui_margin_10dp"
        android:layout_above="@+id/ll_container_set"
        android:text="保存"/>
    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:layout_width="774dp"
        android:layout_height="320dp"
        android:orientation="vertical"
        android:padding="10dp"
        android:id="@+id/ll_container_set"
        android:layout_centerInParent="true"
        android:layout_marginLeft="@dimen/ui_margin_10dp"
        android:layout_marginRight="@dimen/ui_margin_10dp"
        android:gravity="center_horizontal"
        android:background="@color/train_bg"
        android:background="@drawable/stu_score_bg"
        >
        <LinearLayout
@@ -25,7 +35,8 @@
            <TextView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:textColor="@android:color/black"
                android:textColor="@android:color/white"
                android:textSize="@dimen/network_train_textsize25px"
                android:text="考试平台地址:"/>
            <TextView
                android:layout_width="wrap_content"
@@ -36,6 +47,7 @@
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:text="47.93.157.103"
                android:drawableLeft="@drawable/set_arg_et_drawable"
                android:id="@+id/et_platform_ip"
                android:background="@android:drawable/editbox_background_normal"/>
            <TextView
@@ -50,13 +62,7 @@
                android:id="@+id/et_platform_port"
                android:background="@android:drawable/editbox_background_normal"/>
        </LinearLayout>
        <View
            android:layout_width="match_parent"
            android:layout_height="1px"
            android:layout_marginTop="10dp"
            android:layout_marginBottom="10dp"
            android:background="@color/colorAccent"
            />
        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
@@ -90,22 +96,18 @@
                android:text="9001"
                android:background="@android:drawable/editbox_background_normal"/>
        </LinearLayout>
        <View
            android:layout_width="match_parent"
            android:layout_height="1px"
            android:visibility="gone"
            android:layout_marginTop="10dp"
            android:layout_marginBottom="10dp"
            android:background="@color/colorAccent"
            />
        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_marginTop="10dp"
            android:layout_marginBottom="10dp"
            android:orientation="horizontal">
            <TextView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:textColor="@android:color/black"
                android:textColor="@android:color/white"
                android:textSize="@dimen/network_train_textsize25px"
                android:text="@string/rtk_addr_des"/>
            <TextView
                android:layout_width="wrap_content"
@@ -130,21 +132,17 @@
                android:text="8080"
                android:background="@android:drawable/editbox_background_normal"/>
        </LinearLayout>
        <View
            android:layout_width="match_parent"
            android:layout_height="1px"
            android:layout_marginTop="10dp"
            android:layout_marginBottom="10dp"
            android:background="@color/colorAccent"
            />
        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_marginTop="10dp"
            android:layout_marginBottom="10dp"
            android:orientation="horizontal">
            <TextView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:textColor="@android:color/black"
                android:textColor="@android:color/white"
                android:textSize="@dimen/network_train_textsize25px"
                android:text="登录信息:"/>
            <TextView
                android:layout_width="wrap_content"
@@ -185,21 +183,17 @@
                android:inputType="numberDecimal"
                android:background="@android:drawable/editbox_background_normal"/>
        </LinearLayout>
        <View
            android:layout_width="match_parent"
            android:layout_height="1px"
            android:layout_marginTop="10dp"
            android:layout_marginBottom="10dp"
            android:background="@color/colorAccent"
            />
        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_marginTop="10dp"
            android:layout_marginBottom="10dp"
            android:orientation="horizontal">
            <TextView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:textColor="@android:color/black"
                android:textColor="@android:color/white"
                android:textSize="@dimen/network_train_textsize25px"
                android:text="车载信号配置:"/>
            <TableLayout
                android:layout_width="match_parent"
@@ -300,22 +294,19 @@
                </TableRow>
            </TableLayout>
        </LinearLayout>
        <View
            android:layout_width="match_parent"
            android:layout_height="1px"
            android:layout_marginTop="10dp"
            android:layout_marginBottom="10dp"
            android:background="@color/colorAccent"
            />
    <LinearLayout
        android:layout_width="match_parent"
        android:layout_marginTop="10dp"
        android:layout_marginBottom="10dp"
        android:layout_height="wrap_content"
        android:orientation="horizontal">
        <TextView
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:textColor="@android:color/black"
            android:textColor="@android:color/white"
            android:textSize="@dimen/network_train_textsize25px"
            android:text="配置参数:"/>
        <TableLayout
            android:layout_width="match_parent"
@@ -328,6 +319,8 @@
                android:layout_height="wrap_content"
                android:text="协处理器升级"
                android:padding="5dp"
                android:textColor="@android:color/white"
                android:textSize="@dimen/network_train_textsize21px"
                android:id="@+id/btn_mcu_upgrade"
                android:layout_marginLeft="15dp"
                android:background="@drawable/btn_bg_baseset"/>
@@ -335,6 +328,8 @@
                android:layout_height="wrap_content"
                android:text="场考地图选择"
                android:padding="5dp"
                android:textColor="@android:color/white"
                android:textSize="@dimen/network_train_textsize21px"
                android:id="@+id/btn_map_select"
                android:layout_marginLeft="15dp"
                android:background="@drawable/btn_bg_baseset"/>
@@ -342,6 +337,8 @@
                android:layout_height="wrap_content"
                android:text="车辆模型选择"
                android:padding="5dp"
                android:textColor="@android:color/white"
                android:textSize="@dimen/network_train_textsize21px"
                android:id="@+id/btn_car_select"
                android:layout_marginLeft="15dp"
                android:background="@drawable/btn_bg_baseset"/>
@@ -349,6 +346,8 @@
                android:layout_height="wrap_content"
                android:text="路考地图选择"
                android:padding="5dp"
                android:textColor="@android:color/white"
                android:textSize="@dimen/network_train_textsize21px"
                android:id="@+id/btn_roadmap_select"
                android:layout_marginLeft="15dp"
                android:background="@drawable/btn_bg_baseset"/>
@@ -357,20 +356,24 @@
    </LinearLayout>
        <View
            android:layout_width="match_parent"
            android:layout_height="1px"
            android:layout_marginTop="10dp"
            android:layout_marginBottom="10dp"
            android:background="@color/colorAccent"
            />
        <Button
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:id="@+id/btn_save_platform"
            android:background="@drawable/btn_state_save"
            android:text="保存"/>
    </LinearLayout>
<!--    </ScrollView>-->
</LinearLayout>
    <Button
        android:id="@+id/btn_return"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_weight="1"
        android:background="@mipmap/return_bg"
        android:drawableLeft="@mipmap/return_pic"
        android:gravity="center_vertical"
        android:paddingLeft="20dp"
        android:text="返回"
        android:drawablePadding="5dp"
        android:textColor="#FFFFFF"
        android:layout_alignParentEnd="true"
        android:layout_alignParentBottom="true"
        android:textSize="@dimen/network_train_textsize24px" />
</RelativeLayout>
app/src/main/res/layout/layout_train_exit.xml
File was deleted
app/src/main/res/layout/profile_layout.xml
@@ -120,19 +120,21 @@
        android:gravity="center"
        android:textColor="#ffa1a1a3"
        android:textSize="13sp"
        android:id="@+id/tv_score_tip"
        android:shadowDx="0"
        android:shadowDy="1"
        android:shadowRadius="3.0"
        android:shadowColor="#330f1329"
       />
</LinearLayout>
        <TextView
        <Button
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            android:textColor="#ffffff"
            android:background="@drawable/start_exam_bg"
            android:textSize="@dimen/network_train_textsize24px"
            android:gravity="center"
            android:id="@+id/btn_start"
            android:layout_marginTop="2dp"
            android:text="开始考试"/>
    </LinearLayout>
app/src/main/res/values/dimens.xml
@@ -10,4 +10,8 @@
    <dimen name="ui_margin_10dp">10dp</dimen>
    <dimen name="ui_margin_20dp">20dp</dimen>
    <dimen name="ui_margin_5dp">5dp</dimen>
    <dimen name="network_train_textsize26px">21sp</dimen>
    <dimen name="width_160px_dp">127dp</dimen>
    <dimen name="network_train_textsize21px">17sp</dimen>
    <dimen name="network_train_textsize25px">19sp</dimen>
</resources>