修改时间

Admin

2021-02-22 bb9c1b1e6d810737cf8faab907a33f3d396ee5cd

修改时间

 app/src/main/java/safeluck/drive/evaluation/Constant.java

@@ -115,6 +115,7 @@
    public static final String LIGHT_DEFAULT_JSON = "lightdefault.json";
    public static final String LIGHT_ALL_ANSWER_JSON = "lightallanswers.json";
    public static final String LIGHT_ALL_DEFAULT_JSON = "lightAlldefault.json";
    public static final int  EXIT_EXAM = -1;//只要有五次退出 就退出单机训练，重新开始；
    public static String exam_enter_exitdata="exam_enter_exitdata";
    public static int Chang_di = 2;
    public static int DaoLu_night = 3;

 app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailedProj_select.java

@@ -83,7 +83,12 @@
                ", stu_id=" + stu_id +
                ", item_content='" + item_content + '\'' +
                ", deducting_reason='" + deducting_reason + '\'' +
                ", sn=" + sn +
                ", utc='" + utc + '\'' +
                ", score_deducting=" + score_deducting +
                '}';
    }



}

 app/src/main/java/safeluck/drive/evaluation/adapter/ScoreAdapter.java

@@ -81,7 +81,7 @@
        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_time.setText(Utils.utc2NetWorkTimeMillSeconds(scoreBean.getUtcStr()));
        dataHodler.tv_item_code.setTextColor(Color.parseColor("#FFFFFF"));
        dataHodler.tv_item_code.setText(scoreBean.getItem_code()+"");


 app/src/main/java/safeluck/drive/evaluation/app.java

@@ -73,6 +73,7 @@
public class app extends Application implements IAYExamListener  {

    private static final String TAG = "JiaKaoApplication";
    private static  int EXIT_EXAM_COUNT = 0;
    private static Context appContext=null;
    @Override
    public void onCreate() {
@@ -315,6 +316,7 @@
                                JsonObject jsonObject = jsonArray.get(i).getAsJsonObject();
                                int emp_id = jsonObject.get("wrong_id").getAsInt();
                                String utc = jsonObject.get("utc").getAsString();
                                Log.i(TAG,"jdge utc="+utc);
                                int sn = jsonObject.get("sn").getAsInt();


@@ -326,9 +328,9 @@
                                    jkMessage0203.fail_reason = ttsStr.getDeducting_reason();


                                if (!TextUtils.isEmpty(utc) && utc.length() > 14) {
                                    utc = utc.substring(0, 14);
                                }
//                                if (!TextUtils.isEmpty(utc) && utc.length() > 14) {
//                                    utc = utc.substring(0, 14);
//                                }
                                Date date = new Date(Utils.utc2NetWorkTime(utc));
                                jkMessage0203.timeBCD = date;
                                jkMessage0203.exam_id = ExamPlatformData.getInstance().getExam_id();
@@ -444,7 +446,15 @@
                    type = rtkConfigUpdtea.getInt("type");
                    enter_status = rtkConfigUpdtea.getInt("enter");
                    mapId = rtkConfigUpdtea.getInt("map_id");

                    if (enter_status==0){
                        Log.i(TAG,"全局设置退出");
                        EXIT_EXAM_COUNT++;
                        if (EXIT_EXAM_COUNT==5){
                            Log.i(TAG,"全局设置退出---");
                            ExamPlatformData.getInstance().setExitExam(Constant.EXIT_EXAM);
                            EXIT_EXAM_COUNT = 0;
                        }
                    }
                    String itemstr=ExamPlatformData.getInstance().getItemStatusStr(type);
                    MyLog.i(PlatFormConstant.LUKAO,String.format("%s",itemstr+(enter_status==Constant.EXIT_CURRENT_ITEM?"结束":"开始")));
                    if (ExamPlatformData.getInstance().getTrainingMode()== ExamPlatformData.TRAINING_MODE){

 app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java

@@ -629,5 +629,12 @@
        return bindServiceStats;
    }


//==-1 就退出单机训练，然后自动开始 （计数是放在了内存当中）
    private int exit_Exam_flag = 0;
    public void setExitExam(int exitExam) {
        this.exit_Exam_flag = exitExam;
    }
    public int getExitExamFlag(){
        return exit_Exam_flag;
    }
}

 app/src/main/java/safeluck/drive/evaluation/bean/ScoreBean.java

@@ -23,6 +23,8 @@

    private long mUtc;

    private String utcStr;

    public int getItem_code() {
        return item_code;
    }
@@ -45,10 +47,12 @@
        if (Utils.isDigital(utc)){

            mUtc = Utils.dateToLongSec(utc);
            this.utcStr = utc+"0";

        }else{
            MyLog.i("utc时间不是纯数字"+utc);
            mUtc = System.currentTimeMillis();
            this.utcStr="20210222142545.120";

        }
        this.item_code= item_code;
@@ -58,6 +62,10 @@
        return mUtc;
    }

    public String getUtcStr(){
        return utcStr;
    }



    public float getScore() {

 app/src/main/java/safeluck/drive/evaluation/fragment/ArcGisMapFragment.java

@@ -560,7 +560,7 @@
//        canvas2.drawCircle((float) (base_x + (mainAnt.get(0) - min_x) * scale_x), (float) (base_y + (mainAnt.get(1) - min_y) * scale_y), 2, paint);
        canvas3.drawCircle((float) base_x, (float) base_y, 2, paint);

        if (gisCarModel != null){
        if (gisCarModel != null&&car.length>0 && tire.size()>0){
            paint.setColor(Color.RED);
            Log.i(TAG,String.format("scalex=%d,scaley=%d,car[0][0]=%f,base_x=%f,base_y=%f",scale_x,scale_y,car[tire.get(0)][0],base_x,base_y));
            canvas3.drawCircle((float) (base_x + (car[tire.get(0)][0]) * scale_x), (float) (base_y + (car[tire.get(0)][1]) * scale_y), 2.5f, paint);

 app/src/main/java/safeluck/drive/evaluation/util/Utils.java

@@ -609,6 +609,18 @@
        long utcTime = date.getTime()+8*60*60*1000;
        return utcTime;
    }
    public static String  utc2NetWorkTimeStr(String utc){
        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
        Date date = null;
        try {
            date = simpleDateFormat.parse(utc);
        } catch (ParseException e) {
            e.printStackTrace();
        }
        long utcTime = date.getTime()+8*60*60*1000;
        date.setTime(utcTime);
        return simpleDateFormat.format(date);
    }
    public static String  utc2NetWorkTimeMillSeconds(String utcMillSeconds){
        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss.SSS");
        Date date = null;

 app/src/main/java/safeluck/drive/evaluation/viewmodels/ExitExamViewModel.kt

New file
@@ -0,0 +1,25 @@
package safeluck.drive.evaluation.viewmodels

import android.util.Log
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import safeluck.drive.evaluation.bean.ExamPlatformData

/**
 * 用来监视是否要结束训练  数值变化
 */
class ExitExamViewModel :ViewModel(){
    private val TAG = "ExitExamViewModel"
    private var exit_exam_count=MutableLiveData<Int>()
    fun getLiveDataExitExam():LiveData<Int>{
        loadValue()
        return exit_exam_count
    }

    private fun loadValue() {
        Log.i(TAG,"loadvalue"+ExamPlatformData.getInstance().exitExamFlag)
        exit_exam_count .postValue(ExamPlatformData.getInstance().exitExamFlag)
    }

}