From bb9c1b1e6d810737cf8faab907a33f3d396ee5cd Mon Sep 17 00:00:00 2001
From: Admin <Dana_Lee1016@126.com>
Date: 星期一, 22 二月 2021 14:51:55 +0800
Subject: [PATCH] 修改时间
---
app/src/main/java/safeluck/drive/evaluation/Constant.java | 1
app/src/main/java/safeluck/drive/evaluation/app.java | 18 +++++++--
app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java | 9 ++++
app/src/main/java/safeluck/drive/evaluation/bean/ScoreBean.java | 8 ++++
app/src/main/java/safeluck/drive/evaluation/fragment/ArcGisMapFragment.java | 2
app/src/main/java/safeluck/drive/evaluation/adapter/ScoreAdapter.java | 2
app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailedProj_select.java | 5 ++
app/src/main/java/safeluck/drive/evaluation/util/Utils.java | 12 ++++++
app/src/main/java/safeluck/drive/evaluation/viewmodels/ExitExamViewModel.kt | 25 ++++++++++++
9 files changed, 75 insertions(+), 7 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/Constant.java b/app/src/main/java/safeluck/drive/evaluation/Constant.java
index 769a789..3506c95 100644
--- a/app/src/main/java/safeluck/drive/evaluation/Constant.java
+++ b/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;
diff --git a/app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailedProj_select.java b/app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailedProj_select.java
index 60e62f2..60fc7d6 100644
--- a/app/src/main/java/safeluck/drive/evaluation/DB/failitems/FailedProj_select.java
+++ b/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 +
'}';
}
+
+
+
}
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 f8decb0..a41715e 100644
--- a/app/src/main/java/safeluck/drive/evaluation/adapter/ScoreAdapter.java
+++ b/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()+"");
diff --git a/app/src/main/java/safeluck/drive/evaluation/app.java b/app/src/main/java/safeluck/drive/evaluation/app.java
index 5446caa..783a7c3 100644
--- a/app/src/main/java/safeluck/drive/evaluation/app.java
+++ b/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){
diff --git a/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java b/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java
index 03a2385..7146503 100644
--- a/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java
+++ b/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;
+ }
}
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 5aa04d8..852e6d7 100644
--- a/app/src/main/java/safeluck/drive/evaluation/bean/ScoreBean.java
+++ b/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() {
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/ArcGisMapFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/ArcGisMapFragment.java
index fdb112d..0345799 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/ArcGisMapFragment.java
+++ b/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);
diff --git a/app/src/main/java/safeluck/drive/evaluation/util/Utils.java b/app/src/main/java/safeluck/drive/evaluation/util/Utils.java
index 50e23ff..f6650e3 100644
--- a/app/src/main/java/safeluck/drive/evaluation/util/Utils.java
+++ b/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;
diff --git a/app/src/main/java/safeluck/drive/evaluation/viewmodels/ExitExamViewModel.kt b/app/src/main/java/safeluck/drive/evaluation/viewmodels/ExitExamViewModel.kt
new file mode 100644
index 0000000..d9eb975
--- /dev/null
+++ b/app/src/main/java/safeluck/drive/evaluation/viewmodels/ExitExamViewModel.kt
@@ -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)
+ }
+
+}
\ No newline at end of file
--
Gitblit v1.8.0