From d7b1bfcc035a6ba2b6e67db88f4ab04ef3448e3f Mon Sep 17 00:00:00 2001
From: endian11 <Dana_Lee1016@126.com>
Date: 星期二, 07 一月 2020 19:19:22 +0800
Subject: [PATCH] 提交考试考试/结束考试，修改AYSDK
---
app/src/main/java/safeluck/drive/evaluation/Constant.java | 47 +++++++++++++++++++++++
lib/src/main/java/com/anyun/exam/lib/IAYExamInterface.java | 2
lib/src/main/java/com/anyun/exam/lib/SvrManager.java | 13 +++---
app/src/main/res/layout/layout_net_train.xml | 1
lib/src/main/java/com/anyun/exam/lib/IAYExamListener.java | 2
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java | 36 +++++++++++++++++
lib/src/main/java/com/anyun/exam/lib/AYSdk.java | 6 ++-
lib/src/main/java/com/anyun/exam/lib/RemoteService.java | 2
8 files changed, 97 insertions(+), 12 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/Constant.java b/app/src/main/java/safeluck/drive/evaluation/Constant.java
new file mode 100644
index 0000000..9b6739f
--- /dev/null
+++ b/app/src/main/java/safeluck/drive/evaluation/Constant.java
@@ -0,0 +1,47 @@
+package safeluck.drive.evaluation;
+
+/**
+ * MyApplication2
+ * Created by lzw on 2020/1/7. 18:01:40
+ * 閭锛�632393724@qq.com
+ * All Rights Saved! Chongqing AnYun Tech co. LTD
+ */
+public class Constant {
+ //1锛嶯DK鍚姩鎸囩ず
+ public static final int NDK_START= 0x0001;
+ //2锛庤幏鍙朢TK骞冲彴淇℃伅
+ public static final int FETCH_RTK_PLATFORM_INFO= 0x0002;
+ //3锛庢帹閫丷TK骞冲彴淇℃伅
+ public static final int PUSH_RTK_PLATFORM_INFO= 0x8002;
+ //4锛嶳TK骞冲彴杩炴帴鐘舵��
+ public static final int RTK_PLATFORM_CONNECT_STATUS = 0x0003;
+ //5锛嶳TK骞冲彴娉ㄥ唽鐘舵��
+ public static final int RTK_PLATFORM_REGISTER_STATUS = 0x0004;
+//6锛嶳TK骞冲彴鐧诲綍缁撴灉
+ public static final int RTK_PLATFORM_REGISTER_RESULT = 0x0005;
+ //7锛庤幏鍙栧湴鍥句俊鎭�
+ public static final int FETCH_MAP_INFO = 0x0006;
+ //8锛庢帹閫佸湴鍥�
+ public static final int PUSH_MAP_INFO = 0x8006;
+
+ //9锛庤姹傝溅杈嗚疆寤撲俊鎭�
+ public static final int REQ_VECHILE_PROFILE = 0x0007;
+ //10锛庢帹閫佽溅杈嗚疆寤撲俊鎭�
+ public static final int PUSH_VECHILE_PROFILE = 0x8007;
+
+ //11锛庤姹傚紑鍏抽噺閰嶇疆琛�
+ public static final int SIGNAL_CONFIG_TABLE = 0x0008;
+ //12锛庝笅鍙戝紑鍏抽噺閰嶇疆琛�
+ public static final int SIGNAL_CONFIG_RESULT = 0x8008;
+ //13锛庡紑濮嬭�冭瘯{"exam":0} int 0-缁撴潫 1-寮�濮�
+ public static final int EXAM_STATUS = 0x8009;
+ //14锛嶯DK鑰冭瘯搴旂瓟
+ public static final int EXAM_STATUS_REPLY = 0x0009;
+ //15锛嶨PS淇℃伅
+ public static final int GPS_INFO = 0x000A;
+ //16锛嶳TK淇℃伅
+ public static final int RTK_INFO = 0x000b;
+ //17锛庤瘎鍒や俊鎭痆{"wrong_id":0},{"wrong_id":3}]
+ public static final int JUDGE_INFO = 0x000c;
+
+}
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 6b9695e..098acc8 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
@@ -2,22 +2,32 @@
import android.os.Bundle;
+import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.ListView;
+import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.anyun.exam.lib.AYSdk;
+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.R;
import safeluck.drive.evaluation.adapter.ScoreAdapter;
import safeluck.drive.evaluation.bean.ScoreBean;
@@ -31,6 +41,7 @@
*/
public class NetWorkTrainFragment extends SupportFragment implements View.OnClickListener {
+ private static final String TAG = NetWorkTrainFragment.class.getSimpleName();
private ListView mListView ;
private Button btn_start_exam;
private ScoreAdapter mScoreAdapter;
@@ -55,6 +66,7 @@
mListView.setAdapter(mScoreAdapter);
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));
mArrayList.add(new ScoreBean(12,"鐩磋杞集","鍚庤疆鑳庡帇绾�"));
mArrayList.add(new ScoreBean(100,"鍊掕溅鍏ュ簱","鏈郴瀹夊叏甯�"));
@@ -70,8 +82,30 @@
public void onClick(View v) {
switch (v.getId()){
case R.id.btn_start:
- AYSdk.getInstance().at_sendCmd("AT+BEGIN_EXAM:0\r\n");
+ try {
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("exam",1);
+ String examJson = jsonObject.toString();
+ Log.i(TAG, "onClick: "+examJson);
+ AYSdk.getInstance().sendCmd(Constant.EXAM_STATUS,examJson);
+ } catch (JSONException e) {
+ e.printStackTrace();
+ }
+ break;
+ case R.id.tv_stop:
+ Toast.makeText(_mActivity, "缁撴潫鑰冭瘯", Toast.LENGTH_SHORT).show();
+ try {
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("exam",0);
+ String examJson = jsonObject.toString();
+ Log.i(TAG, "onClick: "+examJson);
+ AYSdk.getInstance().sendCmd(Constant.EXAM_STATUS,examJson);
+ } catch (JSONException e) {
+ e.printStackTrace();
+ }
break;
}
}
+
+
}
diff --git a/app/src/main/res/layout/layout_net_train.xml b/app/src/main/res/layout/layout_net_train.xml
index 79bf1ea..a55dc01 100644
--- a/app/src/main/res/layout/layout_net_train.xml
+++ b/app/src/main/res/layout/layout_net_train.xml
@@ -42,6 +42,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="鍛煎彨璇锋眰"
+ android:id="@+id/tv_stop"
android:textColor="@android:color/white"
android:padding="10dp"
diff --git a/lib/src/main/java/com/anyun/exam/lib/AYSdk.java b/lib/src/main/java/com/anyun/exam/lib/AYSdk.java
index 76a6970..d4e4feb 100644
--- a/lib/src/main/java/com/anyun/exam/lib/AYSdk.java
+++ b/lib/src/main/java/com/anyun/exam/lib/AYSdk.java
@@ -82,9 +82,11 @@
}
@Override
- public void at_sendCmd(String s) {
- SvrManager.getInstance().at_sendCmd(s);
+ public void sendCmd(int cmd, String s) {
+ SvrManager.getInstance().sendCmd(cmd,s);
}
+
+
}
diff --git a/lib/src/main/java/com/anyun/exam/lib/IAYExamInterface.java b/lib/src/main/java/com/anyun/exam/lib/IAYExamInterface.java
index b34c6ec..8919355 100644
--- a/lib/src/main/java/com/anyun/exam/lib/IAYExamInterface.java
+++ b/lib/src/main/java/com/anyun/exam/lib/IAYExamInterface.java
@@ -13,5 +13,5 @@
void add();
void registListener(IAYExamListener iayExamListener);
- void at_sendCmd(String s);
+ void sendCmd(int cmd,String s);
}
diff --git a/lib/src/main/java/com/anyun/exam/lib/IAYExamListener.java b/lib/src/main/java/com/anyun/exam/lib/IAYExamListener.java
index 4f812d9..bee2b40 100644
--- a/lib/src/main/java/com/anyun/exam/lib/IAYExamListener.java
+++ b/lib/src/main/java/com/anyun/exam/lib/IAYExamListener.java
@@ -9,5 +9,5 @@
* All Rights Saved! Chongqing AnYun Tech co. LTD
*/
public interface IAYExamListener {
- void callBackMsg(int cmd, String json);
+ void callBackMsg(int code,String json);
}
diff --git a/lib/src/main/java/com/anyun/exam/lib/RemoteService.java b/lib/src/main/java/com/anyun/exam/lib/RemoteService.java
index b28979c..516a9e4 100644
--- a/lib/src/main/java/com/anyun/exam/lib/RemoteService.java
+++ b/lib/src/main/java/com/anyun/exam/lib/RemoteService.java
@@ -67,7 +67,7 @@
Log.i(TAG,"onCreate()");
speaker = new Speaker(getApplicationContext());
- startNative();
+// startNative();
new Thread(new Worker()).start();
}
diff --git a/lib/src/main/java/com/anyun/exam/lib/SvrManager.java b/lib/src/main/java/com/anyun/exam/lib/SvrManager.java
index 823800a..9f761c7 100644
--- a/lib/src/main/java/com/anyun/exam/lib/SvrManager.java
+++ b/lib/src/main/java/com/anyun/exam/lib/SvrManager.java
@@ -69,13 +69,13 @@
}
}
- public void at_sendCmd(String s) {
+ public void sendCmd(int cmd,String s) {
if (!checkRemoteIsNull()){
-// try {
-// remoteInterface.at_sendCmd(s);
-// } catch (RemoteException e) {
-// e.printStackTrace();
-// }
+ try {
+ remoteInterface.SendCmd(cmd,s);
+ } catch (RemoteException e) {
+ e.printStackTrace();
+ }
}
}
@@ -127,6 +127,7 @@
if (mCallback != null){
mCallback.callBackMsg(cmd, json);
+
}
}
--
Gitblit v1.8.0