From 8b2b7fe869118045b1ae5e60e20e70f8c4539558 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期一, 13 一月 2020 19:43:37 +0800
Subject: [PATCH] ArrowView setColorj加入requestLayout 否则无法更新颜色；考试状态记录成表；
---
app/src/main/java/safeluck/drive/evaluation/Constant.java | 1
app/src/main/res/layout/layout_net_train_item.xml | 8
app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusWoker.java | 43 ++++++
app/src/main/java/safeluck/drive/evaluation/customview/HouseView.java | 1
app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusInitWorker.java | 43 ++++++
app/src/main/java/safeluck/drive/evaluation/app.java | 9 +
/dev/null | 39 -----
app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusViewModel.java | 35 +++++
app/src/main/java/safeluck/drive/evaluation/customview/ArrowView.java | 1
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 | 72 +++++++--
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 +++++++
16 files changed, 347 insertions(+), 66 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/Constant.java b/app/src/main/java/safeluck/drive/evaluation/Constant.java
index 7e792d4..d93692e 100644
--- a/app/src/main/java/safeluck/drive/evaluation/Constant.java
+++ b/app/src/main/java/safeluck/drive/evaluation/Constant.java
@@ -62,4 +62,5 @@
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/app.java b/app/src/main/java/safeluck/drive/evaluation/app.java
index 64bcfbf..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;
@@ -121,6 +123,9 @@
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);
@@ -197,7 +202,9 @@
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/bean/ExamStatus.java b/app/src/main/java/safeluck/drive/evaluation/bean/ExamStatus.java
deleted file mode 100644
index fdb32f5..0000000
--- a/app/src/main/java/safeluck/drive/evaluation/bean/ExamStatus.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package safeluck.drive.evaluation.bean;
-
-public class ExamStatus {
-// 1 - 鍊掑簱
-//2 - 鍧¤捣
-//3 - 渚ф柟鍋滆溅
-//4 - 鏇茬嚎琛岄┒
-//5 - 鐩磋杞集
- private int map_id;
-
- //0 閫�鍑猴紙鑰冭瘯瀹屾瘯锛�
- //1 杩涘叆锛堟鍦ㄨ繘琛岃�冭瘯锛� 2-寰呰��
- private int enter;
-
-
-
- public ExamStatus(int map_id, int enter) {
- this.map_id = map_id;
- this.enter = enter;
- }
-
- 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;
- }
-
-
-}
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 b2d69f5..dd8262e 100644
--- a/app/src/main/java/safeluck/drive/evaluation/customview/ArrowView.java
+++ b/app/src/main/java/safeluck/drive/evaluation/customview/ArrowView.java
@@ -81,5 +81,6 @@
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 82dda01..f350d35 100644
--- a/app/src/main/java/safeluck/drive/evaluation/customview/HouseView.java
+++ b/app/src/main/java/safeluck/drive/evaluation/customview/HouseView.java
@@ -80,5 +80,6 @@
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 33981af..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,27 +19,22 @@
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.bean.ExamStatus;
+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;
@@ -60,12 +57,28 @@
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<>();
public static SupportFragment newInstance() {
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
@@ -93,12 +106,30 @@
});
+ 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 examStatus) {
- int map_id = examStatus.getMap_id();
- int status = examStatus.getEnter();
+ 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) {
@@ -150,18 +181,19 @@
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));
+// 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));
- 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)));
+// 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);
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
--
Gitblit v1.8.0