From 8ee5db35d4b70cd13ca31d3783f427208aa8c0a4 Mon Sep 17 00:00:00 2001
From: endian11 <Dana_Lee1016@126.com>
Date: 星期五, 04 十二月 2020 11:36:56 +0800
Subject: [PATCH] 重构发送初始数据 ，改在蓝牙连接状态之后发送初始数据和考试状态
---
app/src/main/java/safeluck/drive/evaluation/fragment/SetArgumentsFragment.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/SetArgumentsFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/SetArgumentsFragment.java
index 388600a..2229bc5 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/SetArgumentsFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/SetArgumentsFragment.java
@@ -54,6 +54,7 @@
import safeluck.drive.evaluation.adapter.WrapContentLinearLayoutManager;
import safeluck.drive.evaluation.bean.ExamPlatformData;
import safeluck.drive.evaluation.bean.MCUInfo;
+import safeluck.drive.evaluation.bean.UserOpStatus;
import safeluck.drive.evaluation.cEventCenter.CEventCenter;
import safeluck.drive.evaluation.cEventCenter.ICEventListener;
import safeluck.drive.evaluation.customview.MyArgEditText;
@@ -269,14 +270,17 @@
case R.id.btn_car_upgrade:
Toast.makeText(_mActivity, "鏇存柊杞︽ā鍨�", Toast.LENGTH_SHORT).show();
DataInitKt.getMap(ExamPlatformData.getInstance().getPhone(),"car");
+ UserOpStatus.getInstance().resetCarFileSelectState();
break;
case R.id.btn_yard_update:
Toast.makeText(_mActivity, "鏇存柊鍦哄湴鍦板浘", Toast.LENGTH_SHORT).show();
DataInitKt.getMap(ExamPlatformData.getInstance().getPhone(),"yard");
+ UserOpStatus.getInstance().resetItemsFileSelectState();
break;
case R.id.btn_road_update:
Toast.makeText(_mActivity, "鏇存柊閬撹矾鍦板浘", Toast.LENGTH_SHORT).show();
DataInitKt.getMap(ExamPlatformData.getInstance().getPhone(),"road");
+ UserOpStatus.getInstance().resetRoadFileSelectState();
break;
default:
break;
@@ -302,6 +306,7 @@
if (data != null){
final Uri uri= data.getData();
Log.i(TAG, "onActivityResult: "+uri.getPath());
+ UserOpStatus.getInstance().setItemsFileSelectState(UserOpStatus.State.SELECT_ITEMS_MAP_STATE);
ExamPlatformData.getInstance().setNewMapPath(uri.getPath());
CThreadPoolExecutor.runInBackground(()-> {
@@ -321,6 +326,7 @@
final Uri uri= data.getData();
Log.i(TAG, "onActivityResult: "+uri.getPath());
ExamPlatformData.getInstance().setCarModelPath(uri.getPath());
+ UserOpStatus.getInstance().setCarFileSelectState(UserOpStatus.State.SELECT_CAR_FILE_STATE);
CThreadPoolExecutor.runInBackground(()-> {
byte[] fileContent = FileUtil.readFile(uri.getPath());
@@ -339,6 +345,7 @@
final Uri uri= data.getData();
Log.i(TAG, "onActivityResult: "+uri.getPath());
ExamPlatformData.getInstance().setNewRoadMapPath(uri.getPath());
+ UserOpStatus.getInstance().setRoadFileSelectState(UserOpStatus.State.SELECT_ROAD_MAP_STATE);
CThreadPoolExecutor.runInBackground(() -> {
byte[] fileContent = FileUtil.readFile(uri.getPath());
if (fileContent != null){
--
Gitblit v1.8.0