From 683deb483d41c576df68d57e250f02b77289677e Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期二, 10 三月 2020 17:10:32 +0800
Subject: [PATCH] 提交开始模拟灯光考试指令
---
app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java | 32 +++++++---
app/src/main/java/safeluck/drive/evaluation/bean/SimulateNightBean.java | 5 +
app/src/main/java/safeluck/drive/evaluation/customview/MyDialogFragment.java | 59 +++++++++++++++++++
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java | 61 ++++++++++++++++----
4 files changed, 133 insertions(+), 24 deletions(-)
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 81acc8d..55ff7c4 100644
--- a/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java
+++ b/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java
@@ -39,7 +39,7 @@
public static final int DEV_LOGIN = 6;
private static HashMap<Integer,String> examPlatformStrs = new HashMap<>();
private static HashMap<Integer,String> enter_exit_item_tts = new HashMap<>();
- private static List<String> simulate_light_tips = new ArrayList<>();
+ private static List<SimulateNightBean.QuestionBean> simulate_light_tips = new ArrayList<>();
static {
examPlatformStrs.put(TCP_DISCONNECT,"鏈繛鎺�");
examPlatformStrs.put(TCP_CONNECTED,"宸茶繛鎺�");
@@ -61,16 +61,22 @@
enter_exit_item_tts.put(5,"鐩磋杞集");
- simulate_light_tips.add("寮�鍚墠鐓х伅");
- simulate_light_tips.add("寮�鍚墠鐓х伅");
- simulate_light_tips.add("寮�鍚墠鐓х伅");
- simulate_light_tips.add("寮�鍚墠鐓х伅");
- simulate_light_tips.add("寮�鍚墠鐓х伅");
- simulate_light_tips.add("寮�鍚墠鐓х伅");
- simulate_light_tips.add("寮�鍚墠鐓х伅");
- simulate_light_tips.add("寮�鍚墠鐓х伅");
- simulate_light_tips.add("寮�鍚墠鐓х伅");
- simulate_light_tips.add("寮�鍚墠鐓х伅");
+ simulate_light_tips.add(new SimulateNightBean.QuestionBean(1,"寮�鍚墠鐓х伅"));
+ simulate_light_tips.add(new SimulateNightBean.QuestionBean(2,"澶滈棿鍦ㄦ病鏈夎矾鐏収鏄庝笉鑹潯浠朵笅琛岄┒"));
+ simulate_light_tips.add(new SimulateNightBean.QuestionBean(3,"澶滈棿鍦ㄧ獎璺笌闈炴満鍔ㄨ溅浼氳溅"));
+ simulate_light_tips.add(new SimulateNightBean.QuestionBean(4,"璇峰皢鍓嶇収鐏洿鎹㈡垚杩滃厜"));
+ simulate_light_tips.add(new SimulateNightBean.QuestionBean(5,"澶滈棿鍚屾柟鍚戣繎璺濈璺熻溅琛岄┒"));
+ simulate_light_tips.add(new SimulateNightBean.QuestionBean(6,"闆惧ぉ琛岄┒"));
+ simulate_light_tips.add(new SimulateNightBean.QuestionBean(7,"鎷辨ˉ銆佷汉琛岄亾"));
+ simulate_light_tips.add(new SimulateNightBean.QuestionBean(8,"澶滈棿鍦ㄩ亾璺笂鍙戠敓鏁呴殰锛屽Θ纰嶄氦閫氬張闅句互绉诲姩"));
+ simulate_light_tips.add(new SimulateNightBean.QuestionBean(9," 澶滈棿閫氳繃鎬ュ集銆佸潯璺�佹嫳妗ャ�佷汉琛屾í閬撱�佹垨鑰呮病鏈変氦閫氫俊鍙风伅鎺у埗鐨勮矾鍙�"));
+ simulate_light_tips.add(new SimulateNightBean.QuestionBean(10,"娌℃湁浜ら�氭帶鍒剁伅涔嬭矾鍙�"));
+ simulate_light_tips.add(new SimulateNightBean.QuestionBean(11,"涓存椂鍋滆溅"));
+ simulate_light_tips.add(new SimulateNightBean.QuestionBean(12,"瓒呰溅"));
+
+
+ simulate_light_tips.add(new SimulateNightBean.QuestionBean(100,"涓嬮潰灏嗚繘琛屾ā鎷熷闂磋椹跺満鏅伅鍏変娇鐢ㄧ殑鑰冭瘯锛岃鎸夎闊虫寚浠ゅ湪5绉掑唴鍋氬嚭鐩稿簲鐨勭伅鍏夋搷浣�"));
+ simulate_light_tips.add(new SimulateNightBean.QuestionBean(101,"妯℃嫙澶滈棿鑰冭瘯瀹屾垚璇峰叧闂墍鏈夌伅鍏夛紝璇疯捣姝ョ户缁畬鎴愯�冭瘯"));
@@ -238,4 +244,8 @@
public String getPhone() {
return mPhone;
}
+
+ public List<SimulateNightBean.QuestionBean> getSimulate_light_tips() {
+ return simulate_light_tips;
+ }
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/bean/SimulateNightBean.java b/app/src/main/java/safeluck/drive/evaluation/bean/SimulateNightBean.java
index eed0667..46cc690 100644
--- a/app/src/main/java/safeluck/drive/evaluation/bean/SimulateNightBean.java
+++ b/app/src/main/java/safeluck/drive/evaluation/bean/SimulateNightBean.java
@@ -37,6 +37,11 @@
private int item;
private String tts;
+ public QuestionBean(int i, String s) {
+ this.item =i;
+ this.tts = s;
+ }
+
public int getItem() {
return item;
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/customview/MyDialogFragment.java b/app/src/main/java/safeluck/drive/evaluation/customview/MyDialogFragment.java
new file mode 100644
index 0000000..b1452c4
--- /dev/null
+++ b/app/src/main/java/safeluck/drive/evaluation/customview/MyDialogFragment.java
@@ -0,0 +1,59 @@
+package safeluck.drive.evaluation.customview;
+
+import android.app.Dialog;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
+
+public class MyDialogFragment extends DialogFragment {
+ @Nullable
+ @Override
+ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+
+ return super.onCreateView(inflater, container, savedInstanceState);
+ }
+
+ @NonNull
+ @Override
+ public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+ AlertDialog dialog = new AlertDialog.Builder(getActivity())
+ .setTitle("璇烽�夋嫨鑰冭瘯椤�")
+ .setMessage("鏉ラ�夋嫨浣犺瀹炵幇鐨勪竴涓効鏈涙妸")
+ .setPositiveButton("鍦鸿��", new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ if (callback != null){
+ callback.changKao();
+ }
+ }
+ })
+ .setNegativeButton("璺��", new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ if (callback!= null){
+ callback.luKao();
+ }
+ }
+ }).create();
+ return dialog;
+ }
+ private Callback callback;
+
+
+ public interface Callback{
+ void changKao();
+ void luKao();
+ }
+
+
+ public void setCallback(Callback callback) {
+ this.callback = callback;
+ }
+}
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 01c396d..00235ce 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
@@ -27,6 +27,7 @@
import com.anyun.exam.lib.AYSdk;
import com.anyun.exam.lib.MyLog;
+import com.google.gson.Gson;
import org.json.JSONException;
import org.json.JSONObject;
@@ -51,10 +52,12 @@
import safeluck.drive.evaluation.DB.exam_status.ExamStatus;
import safeluck.drive.evaluation.bean.ExamPlatformData;
import safeluck.drive.evaluation.bean.ScoreBean;
+import safeluck.drive.evaluation.bean.SimulateNightBean;
import safeluck.drive.evaluation.cEventCenter.CEventCenter;
import safeluck.drive.evaluation.cEventCenter.ICEventListener;
import safeluck.drive.evaluation.customview.ArrowView;
import safeluck.drive.evaluation.customview.HouseView;
+import safeluck.drive.evaluation.customview.MyDialogFragment;
import safeluck.drive.evaluation.im.MessageProcessor;
import safeluck.drive.evaluation.platformMessage.JKMessage0201;
import safeluck.drive.evaluation.platformMessage.JKMessage0202;
@@ -71,9 +74,12 @@
public class NetWorkTrainFragment extends SupportFragment implements View.OnClickListener {
private static final String TAG = NetWorkTrainFragment.class.getSimpleName();
+
+ private int exam_type = 2;//2 鍦哄湴锛�3 閬撹矾锛屾ā鎷熷鑰冿紱4 閬撹矾锛屽疄闄呭鑰冿紱
private ListView mListView;
private Button btn_start_exam;
private TextView tv_stop;//鍛煎彨璇锋眰锛堢粨鏉熻�冭瘯锛�
+ private Gson gson = new Gson();
private ScoreAdapter mScoreAdapter;
private ArrowView av_zhijiao, av_curve, av_park, av_podao;
private HouseView houseView;
@@ -199,7 +205,7 @@
if (examStatus.get(0).getStartExam() == Constant.HAS_BEEN_START_EXAM){
btn_start_exam.setEnabled(false);
tv_stop.setEnabled(true);
- sendExamJson(Constant.HAS_BEEN_START_EXAM);
+ sendExamJson(Constant.HAS_BEEN_START_EXAM,exam_type);
}else{
btn_start_exam.setEnabled(true);
tv_stop.setEnabled(false);
@@ -390,26 +396,54 @@
}
-
+MyDialogFragment myDialogFragment;
+ SimulateNightBean simulateNightBean = null;
@Override
public void onClick(View v) {
switch (v.getId()) {
case R.id.btn_start:
examStatusViewModel.updateStartExam(Constant.HAS_BEEN_START_EXAM);
failedProjViewModel.deleteAll();
- sendExamJson(1);
+
+ if (myDialogFragment == null){
+ myDialogFragment = new MyDialogFragment();
+ }
+ myDialogFragment.show(getFragmentManager(),"dialog");
+ myDialogFragment.setCallback(new MyDialogFragment.Callback() {
+ @Override
+ public void changKao() {
+ exam_type = 2;
+ sendExamJson(1,exam_type);
+ ExamPlatformData.getInstance().getTTS().speak("寮�濮嬭�冭瘯");
+ }
+
+ @Override
+ public void luKao() {
+ exam_type = 3;
+ sendExamJson(1,exam_type);
+ if (simulateNightBean == null){
+ simulateNightBean = new SimulateNightBean();
+ }
+ simulateNightBean.setExam(0);
+ List<SimulateNightBean.QuestionBean> list = ExamPlatformData.getInstance().getSimulate_light_tips();
+ simulateNightBean.setQuestion(list.subList(list.size()-2,list.size()-1));
+ AYSdk.getInstance().sendCmd(0x8012,gson.toJson(simulateNightBean));
+
+ }
+ });
+
iv_head.getDrawable().setLevel(1);
//娓呯┖sns
sns.clear();
//TODO 鍙戦�丣KMessage0202 缁欏钩鍙帮紝寮�濮嬭�冭瘯
- JKMessage0202 jkMessage0202 = new JKMessage0202();
- jkMessage0202.phone = ExamPlatformData.getInstance().getPhone();
- jkMessage0202.timeBCD = new Date();
- jkMessage0202.curr_exam = 0;
- jkMessage0202.ID = ExamPlatformData.getInstance().getID();
- jkMessage0202.exam_id = ExamPlatformData.getInstance().getExam_id();
- MessageProcessor.getInstance().sendMessage(jkMessage0202);
- ExamPlatformData.getInstance().getTTS().speak("寮�濮嬭�冭瘯");
+// JKMessage0202 jkMessage0202 = new JKMessage0202();
+// jkMessage0202.phone = ExamPlatformData.getInstance().getPhone();
+// jkMessage0202.timeBCD = new Date();
+// jkMessage0202.curr_exam = 0;
+// jkMessage0202.ID = ExamPlatformData.getInstance().getID();
+// jkMessage0202.exam_id = ExamPlatformData.getInstance().getExam_id();
+// MessageProcessor.getInstance().sendMessage(jkMessage0202);
+
break;
case R.id.tv_stop:
Toast.makeText(_mActivity, "缁撴潫鑰冭瘯", Toast.LENGTH_SHORT).show();
@@ -436,10 +470,11 @@
}
}
- private void sendExamJson(int i) {
+ private void sendExamJson(int i,int type) {
try {
JSONObject jsonObject = new JSONObject();
jsonObject.put("exam", i);
+ jsonObject.put("type", type);
String examJson = jsonObject.toString();
Log.i(TAG, "onClick: " + examJson);
AYSdk.getInstance().sendCmd(Constant.EXAM_STATUS, examJson);
@@ -459,7 +494,7 @@
OneTimeWorkRequest examStatusInitWork = OneTimeWorkRequest.from(ExamStatusInitWorker.class);
WorkManager.getInstance(_mActivity).enqueue(examStatusInitWork);
ExamPlatformData.getInstance().getTTS().speak("缁撴潫鑰冭瘯");
- sendExamJson(0);
+ sendExamJson(0,exam_type);
//TODO 鍙戦�丣KMessage0204缁欏钩鍙� 缁撴潫鑰冭瘯
JKMessage0204 jkMessage0204 = new JKMessage0204();
jkMessage0204.phone = ExamPlatformData.getInstance().getPhone();
--
Gitblit v1.8.0