From ed0bc77b9c7168b8c3690f018da9aef230e34c61 Mon Sep 17 00:00:00 2001
From: yy1717 <fctom1215@outlook.com>
Date: 星期二, 14 一月 2020 11:17:26 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/endian11/DriveJudge
---
app/src/main/java/safeluck/drive/evaluation/Constant.java | 3
app/src/main/res/layout/layout_net_train_item.xml | 8
app/src/main/res/values/attrs.xml | 2
app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusWoker.java | 43 ++++
app/src/main/java/safeluck/drive/evaluation/customview/HouseView.java | 6
app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusInitWorker.java | 43 ++++
app/src/main/res/values/colors.xml | 3
app/src/main/java/safeluck/drive/evaluation/app.java | 13 +
app/src/main/java/safeluck/drive/evaluation/MainActivity.java | 9
app/src/main/assets/vehiclemodel.json | 14
app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusViewModel.java | 35 +++
app/src/main/java/safeluck/drive/evaluation/customview/ArrowView.java | 7
app/src/main/java/safeluck/drive/evaluation/DB/WorkRoomDataBase.java | 9
app/src/main/java/safeluck/drive/evaluation/DB/appstatusdb/AppStatusDao.java | 2
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java | 156 ++++++++++++++--
app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java | 9
app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatus.java | 69 +++++++
app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusDao.java | 23 ++
app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusWorkRepo.java | 49 +++++
19 files changed, 462 insertions(+), 41 deletions(-)
diff --git a/app/src/main/assets/vehiclemodel.json b/app/src/main/assets/vehiclemodel.json
index 64ba654..30509bf 100644
--- a/app/src/main/assets/vehiclemodel.json
+++ b/app/src/main/assets/vehiclemodel.json
@@ -1,9 +1,9 @@
{
- "main_ant": [123.3, 85.5],
- "axial": [0, 18],
- "left_front_tire": [4, 5],
- "right_front_tire": [6, 7],
- "left_rear_tire": [8, 9],
- "right_rear_tire": [10, 11],
- "point": [-11.9669, 28.013, -11.5114, 27.137, -10.8069, 27.5039, -10.2969, 26.4212, -9.2102, 26.8894, -9.6513, 28.0027, -8.9758, 28.3797, -9.5057, 29.3232]
+ "main_ant": [0, 0],
+ "axial": [0, 3],
+ "left_front_tire": [1, 0],
+ "right_front_tire": [5, 0],
+ "left_rear_tire": [2, 3],
+ "right_rear_tire": [4, 3],
+ "point": [0, 2, -1, 2, -1, -1, 0, -1, 1, -1, 1, 2]
}
\ No newline at end of file
diff --git a/app/src/main/java/safeluck/drive/evaluation/Constant.java b/app/src/main/java/safeluck/drive/evaluation/Constant.java
index 84e427a..d93692e 100644
--- a/app/src/main/java/safeluck/drive/evaluation/Constant.java
+++ b/app/src/main/java/safeluck/drive/evaluation/Constant.java
@@ -60,4 +60,7 @@
public static final String RTK_LOGIN_CODE_COLUMN = "RTK_LOGIN_CODE_COLUMN";
public static final String RTK_CONN_STATUS_COLUMN = "RTK_CONN_STATUS_COLUMN";
public static final String WORK_PLATFORM_STATUS_COLUMN = "WORK_PLATFORM_STATUS_COLUMN";
+
+ public static final int ENTER_OR_EXIT_ITEM = 0x000D;
+ public static String exam_enter_exitdata="exam_enter_exitdata";
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/DB/WorkRoomDataBase.java b/app/src/main/java/safeluck/drive/evaluation/DB/WorkRoomDataBase.java
index 203bd99..e7893da 100644
--- a/app/src/main/java/safeluck/drive/evaluation/DB/WorkRoomDataBase.java
+++ b/app/src/main/java/safeluck/drive/evaluation/DB/WorkRoomDataBase.java
@@ -24,6 +24,9 @@
import safeluck.drive.evaluation.DB.criterias.CriteriaForIWorker;
import safeluck.drive.evaluation.DB.criterias.CriteriaIDao;
import safeluck.drive.evaluation.DB.criterias.CriteriaIIDao;
+import safeluck.drive.evaluation.DB.exam_status.ExamStatus;
+import safeluck.drive.evaluation.DB.exam_status.ExamStatusDao;
+import safeluck.drive.evaluation.DB.exam_status.ExamStatusInitWorker;
import safeluck.drive.evaluation.DB.failitems.FailProjDao;
import safeluck.drive.evaluation.DB.failitems.FailedProj;
import safeluck.drive.evaluation.DB.failitems.FailedProjWorker;
@@ -40,7 +43,7 @@
* 閭锛�632393724@qq.com
* All Rights Saved! Chongqing AnYun Tech co. LTD
*/
-@Database(entities = {Student.class, CriteriaForI.class, FailedProj.class, CriteriaForII.class, RTKConfig.class, GPSInfo.class, AppStatus.class},version = 1,exportSchema = false)
+@Database(entities = {Student.class, CriteriaForI.class, FailedProj.class, CriteriaForII.class, RTKConfig.class, GPSInfo.class, AppStatus.class, ExamStatus.class},version = 1,exportSchema = false)
public abstract class WorkRoomDataBase extends RoomDatabase {
private static final String TAG = "WorkRoomDataBase";
public abstract StudentDao getstudentDao();
@@ -82,6 +85,7 @@
OneTimeWorkRequest oneTimeWorkRequest2 = OneTimeWorkRequest.from(FailedProjWorker.class);
OneTimeWorkRequest RTKConfigWorkRequest = OneTimeWorkRequest.from(RTKConfigWork.class);
OneTimeWorkRequest appStatusInitWork = OneTimeWorkRequest.from(AppStatusInitWork.class);
+ OneTimeWorkRequest examStatusInitWorker = OneTimeWorkRequest.from(ExamStatusInitWorker.class);
Log.i(TAG, "onCreate: 鍒涘缓鏁版嵁搴撳悗寤虹珛鏁版嵁琛ㄦ彃鍏ユ暟鎹�");
WorkManager.getInstance(mContext).enqueue(oneTimeWorkRequest);
WorkManager.getInstance(mContext).enqueue(oneTimeWorkRequest1);
@@ -89,6 +93,7 @@
WorkManager.getInstance(mContext).enqueue(oneTimeWorkRequest3);
WorkManager.getInstance(mContext).enqueue(RTKConfigWorkRequest);
WorkManager.getInstance(mContext).enqueue(appStatusInitWork);
+ WorkManager.getInstance(mContext).enqueue(examStatusInitWorker);
}
@Override
@@ -110,4 +115,6 @@
public abstract GpsInfoDao getGpsInoDao();
public abstract AppStatusDao getAppStatusDao();
+
+ public abstract ExamStatusDao getExamStatusDao();
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/DB/appstatusdb/AppStatusDao.java b/app/src/main/java/safeluck/drive/evaluation/DB/appstatusdb/AppStatusDao.java
index 76f91a1..61e3a2f 100644
--- a/app/src/main/java/safeluck/drive/evaluation/DB/appstatusdb/AppStatusDao.java
+++ b/app/src/main/java/safeluck/drive/evaluation/DB/appstatusdb/AppStatusDao.java
@@ -2,6 +2,7 @@
import androidx.lifecycle.LiveData;
import androidx.room.Dao;
+import androidx.room.Delete;
import androidx.room.Insert;
import androidx.room.OnConflictStrategy;
import androidx.room.Query;
@@ -22,4 +23,5 @@
//鏇存柊涓氬姟骞冲彴杩炴帴鐘舵��
@Query("update app_status set work_platform=:connStatus where id=0")
void updatework_platformStatus(int connStatus);
+
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatus.java b/app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatus.java
new file mode 100644
index 0000000..40de2af
--- /dev/null
+++ b/app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatus.java
@@ -0,0 +1,69 @@
+package safeluck.drive.evaluation.DB.exam_status;
+
+import androidx.room.Entity;
+import androidx.room.Ignore;
+import androidx.room.PrimaryKey;
+
+@Entity(tableName = "exam_status")
+public class ExamStatus {
+// 1 - 鍊掑簱
+//2 - 鍧¤捣
+//3 - 渚ф柟鍋滆溅
+//4 - 鏇茬嚎琛岄┒
+//5 - 鐩磋杞集
+@PrimaryKey
+ private int map_id;
+
+
+
+
+
+ //0 閫�鍑猴紙鑰冭瘯瀹屾瘯锛�
+ //1 杩涘叆锛堟鍦ㄨ繘琛岃�冭瘯锛� 2-寰呰��
+ private int enter;
+
+
+ //琛ㄧず宸茬粡鐐瑰嚮浜嗗紑濮嬭�冭瘯锛屽苟涓旀敹鍒颁簡鑰冭瘯搴旂瓟 1-宸茬粡寮�濮嬭�冭瘯 0-鏈�冭瘯
+ private int startExam;
+ @Ignore
+ public ExamStatus(int map_id, int enter) {
+ this.map_id = map_id;
+ this.enter = enter;
+ }
+
+ public ExamStatus() {
+ }
+
+ public int getMap_id() {
+ return map_id;
+ }
+
+ public void setMap_id(int map_id) {
+ this.map_id = map_id;
+ }
+
+ public int getEnter() {
+ return enter;
+ }
+
+ public void setEnter(int enter) {
+ this.enter = enter;
+ }
+
+ public int getStartExam() {
+ return startExam;
+ }
+
+ public void setStartExam(int startExam) {
+ this.startExam = startExam;
+ }
+
+ @Override
+ public String toString() {
+ return "ExamStatus{" +
+ "map_id=" + map_id +
+ ", enter=" + enter +
+ ", startExam=" + startExam +
+ '}';
+ }
+}
diff --git a/app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusDao.java b/app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusDao.java
new file mode 100644
index 0000000..bf5b3e0
--- /dev/null
+++ b/app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusDao.java
@@ -0,0 +1,23 @@
+package safeluck.drive.evaluation.DB.exam_status;
+
+import androidx.lifecycle.LiveData;
+import androidx.room.Dao;
+import androidx.room.Insert;
+import androidx.room.OnConflictStrategy;
+import androidx.room.Query;
+
+import java.util.List;
+
+@Dao
+public interface ExamStatusDao {
+ @Insert(onConflict = OnConflictStrategy.REPLACE)
+ void insert(ExamStatus examStatus);
+
+ @Query("Select * from exam_status")
+ LiveData<List<ExamStatus>> getExamStatus();
+
+ @Query("update exam_status set enter =:enter where map_id =:mapid")
+ void updateEnter(int enter,int mapid);
+ @Query("update exam_status set startExam =:startexam")
+ void updateStartExam(int startexam);
+}
diff --git a/app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusInitWorker.java b/app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusInitWorker.java
new file mode 100644
index 0000000..6135535
--- /dev/null
+++ b/app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusInitWorker.java
@@ -0,0 +1,43 @@
+package safeluck.drive.evaluation.DB.exam_status;
+
+import android.content.Context;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.work.Worker;
+import androidx.work.WorkerParameters;
+
+import com.anyun.exam.lib.MyLog;
+
+import java.util.Random;
+
+import safeluck.drive.evaluation.DB.WorkRoomDataBase;
+
+public class ExamStatusInitWorker extends Worker {
+
+ private static final String TAG = ExamStatusInitWorker.class.getSimpleName();
+ private ExamStatus examStatus;
+ private Random random;
+
+ public ExamStatusInitWorker(@NonNull Context context, @NonNull WorkerParameters workerParams) {
+ super(context, workerParams);
+ examStatus = new ExamStatus();
+ random = new Random(3);
+ }
+
+ @NonNull
+ @Override
+ public Result doWork() {
+ MyLog.i(TAG,"exam_status琛╮eset 鍒濆鍖�");
+ for (int i = 0; i < 5; i++) {
+ int a = random.nextInt(3);
+ Log.i(TAG, "doWork: a="+a);
+ examStatus.setEnter(a);//榛樿寰呰�冮」鐩�
+ examStatus.setStartExam(0);//榛樿娌℃湁寮�濮嬭�冭瘯
+ examStatus.setMap_id(i+1);
+
+ WorkRoomDataBase.getWorkRoomDataBase(getApplicationContext()).getExamStatusDao().insert(examStatus);
+ }
+ return Result.success();
+ }
+}
diff --git a/app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusViewModel.java b/app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusViewModel.java
new file mode 100644
index 0000000..9fca3fe
--- /dev/null
+++ b/app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusViewModel.java
@@ -0,0 +1,35 @@
+package safeluck.drive.evaluation.DB.exam_status;
+
+import android.app.Application;
+
+import androidx.annotation.NonNull;
+import androidx.lifecycle.AndroidViewModel;
+import androidx.lifecycle.LiveData;
+
+import java.util.List;
+
+public class ExamStatusViewModel extends AndroidViewModel {
+ ExamStatusWorkRepo examStatusWorkRepo;
+ LiveData<List<ExamStatus>> examStatus;
+ public ExamStatusViewModel(@NonNull Application application) {
+ super(application);
+ examStatusWorkRepo = new ExamStatusWorkRepo(application);
+ examStatus = examStatusWorkRepo.getExamStatus();
+ }
+
+ public void insert(ExamStatus examStatus){
+ examStatusWorkRepo.insertExamStatus(examStatus);
+
+ }
+ public LiveData<List<ExamStatus>> getExamStatus(){
+ return examStatus;
+ }
+
+ public void updateExamStatus(int enter, int mapid) {
+ examStatusWorkRepo.updateExamStatus(enter,mapid);
+ }
+
+ public void updateStartExam(int statExam) {
+ examStatusWorkRepo.updateStartExam(statExam);
+ }
+}
diff --git a/app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusWoker.java b/app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusWoker.java
new file mode 100644
index 0000000..8671173
--- /dev/null
+++ b/app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusWoker.java
@@ -0,0 +1,43 @@
+package safeluck.drive.evaluation.DB.exam_status;
+
+import android.content.Context;
+import android.text.TextUtils;
+
+import androidx.annotation.NonNull;
+import androidx.work.WorkManager;
+import androidx.work.Worker;
+import androidx.work.WorkerParameters;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import safeluck.drive.evaluation.Constant;
+import safeluck.drive.evaluation.DB.WorkRoomDataBase;
+
+public class ExamStatusWoker extends Worker {
+ public ExamStatusWoker(@NonNull Context context, @NonNull WorkerParameters workerParams) {
+ super(context, workerParams);
+ }
+
+ @NonNull
+ @Override
+ public Result doWork() {
+ String str = getInputData().getString(Constant.exam_enter_exitdata);
+ if (!TextUtils.isEmpty(str)){
+ JSONObject jsonObject = null;
+ try {
+ jsonObject = new JSONObject(str);
+ int mapId = jsonObject.getInt("map_id");
+ int enter = jsonObject.getInt("enter");
+ WorkRoomDataBase.getWorkRoomDataBase(getApplicationContext()).getExamStatusDao().updateEnter(enter,mapId);
+ return Result.success();
+ } catch (JSONException e) {
+ e.printStackTrace();
+ return Result.failure();
+ }
+
+ }
+ return Result.success();
+
+ }
+}
diff --git a/app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusWorkRepo.java b/app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusWorkRepo.java
new file mode 100644
index 0000000..7cda4f1
--- /dev/null
+++ b/app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusWorkRepo.java
@@ -0,0 +1,49 @@
+package safeluck.drive.evaluation.DB.exam_status;
+
+import android.app.Application;
+
+import androidx.lifecycle.LiveData;
+
+import java.util.List;
+
+import safeluck.drive.evaluation.DB.WorkRoomDataBase;
+
+public class ExamStatusWorkRepo {
+ private ExamStatusDao examStatusDao;
+ private LiveData<List<ExamStatus>> examStatusLiveData;
+ public ExamStatusWorkRepo(Application application) {
+ examStatusDao = WorkRoomDataBase.getWorkRoomDataBase(application).getExamStatusDao();
+ examStatusLiveData = examStatusDao.getExamStatus();
+ }
+
+ public void insertExamStatus(final ExamStatus examStatus){
+ WorkRoomDataBase.dataBaseWriteExecutor.execute(new Runnable() {
+ @Override
+ public void run() {
+ examStatusDao.insert(examStatus);
+ }
+ });
+ }
+
+ public void updateExamStatus(final int enter, final int mapid){
+ WorkRoomDataBase.dataBaseWriteExecutor.execute(new Runnable() {
+ @Override
+ public void run() {
+ examStatusDao.updateEnter(enter,mapid);
+ }
+ });
+ }
+
+ public void updateStartExam(final int startex){
+ WorkRoomDataBase.dataBaseWriteExecutor.execute(new Runnable() {
+ @Override
+ public void run() {
+ examStatusDao.updateStartExam(startex);
+ }
+ });
+ }
+
+ public LiveData<List<ExamStatus>> getExamStatus() {
+ return examStatusLiveData;
+ }
+}
diff --git a/app/src/main/java/safeluck/drive/evaluation/MainActivity.java b/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
index 65d107d..cea004a 100644
--- a/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
+++ b/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
@@ -49,6 +49,7 @@
private Gson gson = new Gson();
String[] PERMISSIONS = new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA};
RTKConfigViewModel rtkConfigViewModel;
+ private boolean onlySendOnceRTKConfig = true;
private ICEventListener icEventListener = new ICEventListener() {
@Override
@@ -122,7 +123,13 @@
MyLog.i(TAG, "RTKConfig Changed: " + (rtkConfig != null ? rtkConfig.toString() : "null"));
mRTKConfig = rtkConfig;
- sendRtkConfigInfo();
+ synchronized (MainActivity.this){
+ if (onlySendOnceRTKConfig){
+ onlySendOnceRTKConfig = false;
+ sendRtkConfigInfo();
+ }
+ }
+
}
});
diff --git a/app/src/main/java/safeluck/drive/evaluation/app.java b/app/src/main/java/safeluck/drive/evaluation/app.java
index 4da6324..8b3129e 100644
--- a/app/src/main/java/safeluck/drive/evaluation/app.java
+++ b/app/src/main/java/safeluck/drive/evaluation/app.java
@@ -34,6 +34,8 @@
import safeluck.drive.evaluation.DB.WorkRoomDataBase;
import safeluck.drive.evaluation.DB.appstatusdb.AppStatusWorker;
+import safeluck.drive.evaluation.DB.exam_status.ExamStatusInitWorker;
+import safeluck.drive.evaluation.DB.exam_status.ExamStatusWoker;
import safeluck.drive.evaluation.DB.failitems.FailedProj;
import safeluck.drive.evaluation.DB.failitems.FailedProjRepository;
import safeluck.drive.evaluation.DB.gps.GpsInfoWorker;
@@ -119,7 +121,11 @@
MyLog.d(TAG, String.format("鏀跺埌鍛戒护[%d],Json鍐呭涓�%s", cmd, json));
switch (cmd) {
case Constant.NDK_START:
-
+ sendVechileInfo();
+ sendMapInfo();
+ OneTimeWorkRequest examStatusInitWork = OneTimeWorkRequest.from(ExamStatusInitWorker.class);
+ WorkManager.getInstance(getApplicationContext()).enqueue(examStatusInitWork);
+ //TODO 闇�瑕佹竻闄pp_status鏁版嵁搴撹〃
break;
case Constant.RTK_PLATFORM_REGISTER_STATUS:
CEventCenter.dispatchEvent(Constant.BIND_CONNECT_RTK_TOPIC,cmd,0,json);
@@ -195,6 +201,11 @@
OneTimeWorkRequest gpsinfoWorkRequest = new OneTimeWorkRequest.Builder(GpsInfoWorker.class).setInputData(gpsData).build();
WorkManager.getInstance(getApplicationContext()).enqueue(gpsinfoWorkRequest);
break;
+ case Constant.ENTER_OR_EXIT_ITEM:
+ Data exam_enter_exitdata = new Data.Builder().putString(Constant.exam_enter_exitdata,json).build();
+ OneTimeWorkRequest examStatusWorker = new OneTimeWorkRequest.Builder(ExamStatusWoker.class).setInputData(exam_enter_exitdata).build();
+ WorkManager.getInstance(getApplicationContext()).enqueue(examStatusWorker);
+ break;
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/customview/ArrowView.java b/app/src/main/java/safeluck/drive/evaluation/customview/ArrowView.java
index 85e3cd7..dd8262e 100644
--- a/app/src/main/java/safeluck/drive/evaluation/customview/ArrowView.java
+++ b/app/src/main/java/safeluck/drive/evaluation/customview/ArrowView.java
@@ -11,6 +11,7 @@
import android.util.TypedValue;
import android.view.View;
+import androidx.annotation.ColorRes;
import androidx.annotation.Nullable;
import safeluck.drive.evaluation.R;
@@ -44,6 +45,7 @@
super(context, attrs, defStyleAttr);
TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.ArrowView,defStyleAttr,0);
text = a.getString(R.styleable.ArrowView_text);
+ color = a.getColor(R.styleable.ArrowView_color,Color.parseColor("#99C3D1"));
a.recycle();
}
@@ -76,4 +78,9 @@
}
return keys;
}
+
+ public void setColor( int mColor){
+ this.color = mColor;
+ requestLayout();
+ }
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/customview/HouseView.java b/app/src/main/java/safeluck/drive/evaluation/customview/HouseView.java
index 6fb30bd..f350d35 100644
--- a/app/src/main/java/safeluck/drive/evaluation/customview/HouseView.java
+++ b/app/src/main/java/safeluck/drive/evaluation/customview/HouseView.java
@@ -41,6 +41,7 @@
super(context, attrs, defStyleAttr);
TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.ArrowView,defStyleAttr,0);
text = typedArray.getString(R.styleable.ArrowView_text);
+ color = typedArray.getColor(R.styleable.ArrowView_color,Color.parseColor("#99C3D1"));
typedArray.recycle();
}
@@ -76,4 +77,9 @@
}
return keys;
}
+
+ public void setColor(int mColor){
+ this.color = mColor;
+ requestLayout();
+ }
}
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 6b2620d..1b59726 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
@@ -2,6 +2,8 @@
import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
@@ -17,26 +19,24 @@
import androidx.lifecycle.ViewModelProviders;
import com.anyun.exam.lib.AYSdk;
-import com.anyun.exam.lib.MyLog;
-import com.google.gson.Gson;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
import org.json.JSONException;
import org.json.JSONObject;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import me.yokeyword.fragmentation.SupportFragment;
import safeluck.drive.evaluation.Constant;
+import safeluck.drive.evaluation.DB.exam_status.ExamStatusViewModel;
import safeluck.drive.evaluation.DB.failitems.FailedProjViewModel;
import safeluck.drive.evaluation.DB.failitems.FailedProj_select;
import safeluck.drive.evaluation.R;
import safeluck.drive.evaluation.adapter.ScoreAdapter;
+import safeluck.drive.evaluation.DB.exam_status.ExamStatus;
import safeluck.drive.evaluation.bean.ScoreBean;
-import safeluck.drive.evaluation.cEventCenter.CEventCenter;
+import safeluck.drive.evaluation.customview.ArrowView;
+import safeluck.drive.evaluation.customview.HouseView;
/**
* 鑱旂綉璁粌UI
@@ -48,11 +48,17 @@
public class NetWorkTrainFragment extends SupportFragment implements View.OnClickListener {
private static final String TAG = NetWorkTrainFragment.class.getSimpleName();
- private ListView mListView ;
+ private ListView mListView;
private Button btn_start_exam;
private ScoreAdapter mScoreAdapter;
+ private ArrowView av_zhijiao, av_curve, av_park, av_podao;
+ private HouseView houseView;
+ private List<ExamStatus> examStatusList = new ArrayList<>();
+ private List<String> item_conents = new ArrayList<>();//鍧￠亾瀹氱偣鍋滆溅鍜岃捣姝�
private int item_id;//鎵ｅ垎鍒嗘暟鎬诲拰
+ private ExamStatusViewModel examStatusViewModel;
+ private static final int ADD_DATA = 1;
private List<ScoreBean> mArrayList = new ArrayList<>();
@@ -60,10 +66,25 @@
return new NetWorkTrainFragment();
}
+ private Handler mHandler = new Handler(new Handler.Callback() {
+ @Override
+ public boolean handleMessage(Message msg) {
+ if (msg.what == ADD_DATA){
+ av_curve.setColor(whatPaintColor(examStatusList.get(3)));
+ av_zhijiao.setColor(whatPaintColor(examStatusList.get(4)));
+ av_podao.setColor(whatPaintColor(examStatusList.get(1)));
+ av_park.setColor(whatPaintColor(examStatusList.get(2)));
+ houseView.setColor(whatPaintColor(examStatusList.get(0)));
+ }
+ return false;
+ }
+ });
+
@Nullable
@Override
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
- View view = inflater.inflate(R.layout.layout_train_fragment,container,false);
+ View view = inflater.inflate(R.layout.layout_train_fragment, container, false);
+ item_conents.add("渚ф柟鍋滆溅");
initView(view);
FailedProjViewModel failedProjViewModel = ViewModelProviders.of(this).get(FailedProjViewModel.class);
@@ -72,22 +93,108 @@
public void onChanged(List<FailedProj_select> failedProj_selects) {
item_id = 0;
mArrayList.clear();
+ item_conents.clear();
for (FailedProj_select f :
failedProj_selects) {
item_id += f.getScore_deducting();
- Log.i(TAG, "onChanged: "+f.toString());
- mArrayList.add(new ScoreBean(f.getScore_deducting(),f.getItem_content(),f.getDeducting_reason()));
+ Log.i(TAG, "onChanged: " + f.toString());
+ mArrayList.add(new ScoreBean(f.getScore_deducting(), f.getItem_content(), f.getDeducting_reason()));
+ item_conents.add(f.getItem_content());
mScoreAdapter.addDatas(mArrayList);
}
}
});
+ examStatusViewModel = ViewModelProviders.of(this).get(ExamStatusViewModel.class);
+ examStatusViewModel.getExamStatus().observe(this, new Observer<List<ExamStatus>>() {
+ @Override
+ public void onChanged(List<ExamStatus> examStatus) {
+
+ for (ExamStatus e :
+ examStatus) {
+ Log.i(TAG, "onChanged: e="+e.toString());
+ }
+ Log.i(TAG, "onChanged: ");
+ examStatusList.clear();
+ examStatusList.addAll(examStatus);
+ mHandler.obtainMessage(ADD_DATA).sendToTarget();
+
+ }
+ });
+
return view;
}
+ private int whatPaintColor(ExamStatus examStat) {
+ int map_id = examStat.getMap_id();
+ int status = examStat.getEnter();
+ Log.i(TAG, "whatPaintColor: map_id="+map_id+" status="+status);
+ switch (status) {
+ case 0://鑰冭瘯瀹屾垚
+ switch (map_id) {
+ case 1://鍊掑簱
+ if (item_conents.contains("鍊掕溅鍏ュ簱")) {
+ return getResources().getColor(R.color.colorAccent);
+ }else{
+ return getResources().getColor(R.color.train_btn_return);
+ }
+ case 2:
+ if (item_conents.contains("鍧￠亾瀹氱偣鍋滆溅鍜岃捣姝�")) {
+ return getResources().getColor(R.color.colorAccent);
+ }else{
+ return getResources().getColor(R.color.train_btn_return);
+ }
+ case 3:
+ if (item_conents.contains("渚ф柟鍋滆溅")) {
+ return getResources().getColor(R.color.colorAccent);
+ }else{
+ return getResources().getColor(R.color.train_btn_return);
+ }
+ case 4:
+ if (item_conents.contains("鏇茬嚎琛岄┒")) {
+ return getResources().getColor(R.color.colorAccent);
+ }else{
+ return getResources().getColor(R.color.train_btn_return);
+ }
+ case 5:
+ if (item_conents.contains("鐩磋杞集")) {
+ return getResources().getColor(R.color.colorAccent);
+ }else{
+ return getResources().getColor(R.color.train_btn_return);
+ }
+
+ }
+ case 1://杩涘叆鑰冨満椤圭洰
+ return getResources().getColor(R.color.pink);
+ case 2://寰呰��
+ return getResources().getColor(R.color.examing);
+ }
+ return getResources().getColor(R.color.examing);
+ }
+
private void initView(View view) {
- sendRTKConfig2RemoteService();
+
+ av_curve = view.findViewById(R.id.av2);
+ av_park = view.findViewById(R.id.av3);
+ av_podao = view.findViewById(R.id.av4);
+ av_zhijiao = view.findViewById(R.id.av1);
+ houseView = view.findViewById(R.id.hv);
+//绮夌孩鑹叉鍦ㄨ繘琛岃椤圭洰鐨勮�冭瘯
+// examStatusList.add(new ExamStatus(1, 0));
+// examStatusList.add(new ExamStatus(2, 1));
+// examStatusList.add(new ExamStatus(3, 0));
+// examStatusList.add(new ExamStatus(4, 2));
+// examStatusList.add(new ExamStatus(5, 1));
+
+
+// mHandler.obtainMessage(ADD_DATA).sendToTarget();
+// av_curve.setColor(whatPaintColor(examStatusList.get(3)));
+// av_zhijiao.setColor(whatPaintColor(examStatusList.get(4)));
+// av_podao.setColor(whatPaintColor(examStatusList.get(1)));
+// av_park.setColor(whatPaintColor(examStatusList.get(2)));
+// houseView.setColor(whatPaintColor(examStatusList.get(0)));
+
mListView = view.findViewById(R.id.lv);
mListView.setFocusable(false);
view.findViewById(R.id.view_map).setOnClickListener(this);
@@ -96,23 +203,22 @@
btn_start_exam = view.findViewById(R.id.btn_start);
btn_start_exam.setOnClickListener(this);
view.findViewById(R.id.tv_stop).setOnClickListener(this);
- mListView.addHeaderView(LayoutInflater.from(_mActivity).inflate(R.layout.layout_score_item,null));
+ mListView.addHeaderView(LayoutInflater.from(_mActivity).inflate(R.layout.layout_score_item, null));
}
- private void sendRTKConfig2RemoteService() {
-// MyLog.d(TAG,"涓诲姩鎺ㄩ�丷TKConfig");
-// CEventCenter.dispatchEvent(Constant.BIND_RTKCONFIG_TOPIC,Constant.FETCH_RTK_PLATFORM_INFO,0,"");
- }
+
+
+
@Override
public void onClick(View v) {
- switch (v.getId()){
+ switch (v.getId()) {
case R.id.btn_start:
try {
JSONObject jsonObject = new JSONObject();
- jsonObject.put("exam",1);
+ jsonObject.put("exam", 1);
String examJson = jsonObject.toString();
- Log.i(TAG, "onClick: "+examJson);
- AYSdk.getInstance().sendCmd(Constant.EXAM_STATUS,examJson);
+ Log.i(TAG, "onClick: " + examJson);
+ AYSdk.getInstance().sendCmd(Constant.EXAM_STATUS, examJson);
} catch (JSONException e) {
e.printStackTrace();
}
@@ -121,18 +227,18 @@
Toast.makeText(_mActivity, "缁撴潫鑰冭瘯", Toast.LENGTH_SHORT).show();
try {
JSONObject jsonObject = new JSONObject();
- jsonObject.put("exam",0);
+ jsonObject.put("exam", 0);
String examJson = jsonObject.toString();
- Log.i(TAG, "onClick: "+examJson);
- AYSdk.getInstance().sendCmd(Constant.EXAM_STATUS,examJson);
+ Log.i(TAG, "onClick: " + examJson);
+ AYSdk.getInstance().sendCmd(Constant.EXAM_STATUS, examJson);
} catch (JSONException e) {
e.printStackTrace();
}
break;
case R.id.view_map:
MapFragment mapFragment = findFragment(MapFragment.class);
- if (mapFragment==null){
- mapFragment = (MapFragment)MapFragment.newInstance();
+ if (mapFragment == null) {
+ mapFragment = (MapFragment) MapFragment.newInstance();
}
start(mapFragment);
break;
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java
index 296e567..9fd9d18 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java
@@ -29,8 +29,12 @@
import safeluck.drive.evaluation.DB.Student;
import safeluck.drive.evaluation.DB.WokViewModel;
import safeluck.drive.evaluation.DB.WorkRoomDataBase;
+import safeluck.drive.evaluation.DB.appstatusdb.AppStatusInitWork;
import safeluck.drive.evaluation.DB.criterias.CriteriaForI;
import safeluck.drive.evaluation.DB.criterias.viewmodel.CriteriaIViewModel;
+import safeluck.drive.evaluation.DB.exam_status.ExamStatus;
+import safeluck.drive.evaluation.DB.exam_status.ExamStatusInitWorker;
+import safeluck.drive.evaluation.DB.exam_status.ExamStatusViewModel;
import safeluck.drive.evaluation.DB.failitems.FailedProj;
import safeluck.drive.evaluation.DB.failitems.FailedProj_select;
import safeluck.drive.evaluation.DB.gps.GpsInfoWorker;
@@ -68,6 +72,7 @@
View view = inflater.inflate(R.layout.layout_tcpclient, container, false);
initView(view);
// workViewModel =ViewModelProviders.of(this).get(CriteriaIViewModel.class);
+
return view;
@@ -133,7 +138,9 @@
// MessageProcessor.getInstance().sendMessage(sendEditText.getText().toString().trim());
// sendEditText.getText().clear();
-
+ //娓呴櫎app_status 琛�
+// OneTimeWorkRequest oneTimeWorkRequest = new OneTimeWorkRequest.Builder(AppStatusInitWork.class).build();
+// WorkManager.getInstance(_mActivity).enqueue(oneTimeWorkRequest);
break;
diff --git a/app/src/main/res/layout/layout_net_train_item.xml b/app/src/main/res/layout/layout_net_train_item.xml
index 867b2ed..41c2f8a 100644
--- a/app/src/main/res/layout/layout_net_train_item.xml
+++ b/app/src/main/res/layout/layout_net_train_item.xml
@@ -20,13 +20,13 @@
android:layout_height="80dp"
android:layout_toRightOf="@+id/hv"
android:id="@+id/av1"
- app:text="鐩磋杞集"
+ app:text="鍧￠亾瀹氱偣"
android:layout_marginLeft="-15dp"
/>
<safeluck.drive.evaluation.customview.ArrowView
android:layout_width="80dp"
android:layout_height="80dp"
- app:text="鏇茬嚎琛岄┒"
+ app:text="渚ф柟鍋滆溅"
android:layout_marginLeft="-15dp"
android:layout_toRightOf="@+id/av1"
android:id="@+id/av2"
@@ -35,7 +35,7 @@
android:layout_width="80dp"
android:layout_height="80dp"
android:id="@+id/av3"
- app:text="渚ф柟鍋滆溅"
+ app:text="鏇茬嚎琛岄┒"
android:layout_marginLeft="-15dp"
android:layout_toRightOf="@id/av2"
/>
@@ -45,7 +45,7 @@
android:layout_marginLeft="-15dp"
android:layout_toRightOf="@+id/av3"
android:id="@+id/av4"
- app:text="鍧￠亾瀹氱偣"
+ app:text="鐩磋杞集"
/>
</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index a2b1087..61e42b8 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -8,10 +8,10 @@
</declare-styleable>
<declare-styleable name="ArrowView">
<attr name="text" format="string" />
+ <attr name="color" format="color" />
</declare-styleable>
<declare-styleable name="HouseView">
<attr name="item" format="string" />
-
</declare-styleable>
</resources>
\ 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 f65ffa3..9882094 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -11,4 +11,7 @@
<color name="train_bg">#4aabb2</color>
<color name="train_btn_return">#16aa3c</color>
<color name="profile_bg">#1988a3</color>
+ <color name="pink">#FF3399</color>
+ <color name="examing">#99C3D1</color>
+ <color name="red">#DC143C</color>
</resources>
--
Gitblit v1.8.0