From fff165b3215de255000cb133d51ceb03b5202bd6 Mon Sep 17 00:00:00 2001
From: yy1717 <fctom1215@outlook.com>
Date: 星期五, 10 一月 2020 16:07:39 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/endian11/DriveJudge
---
app/src/main/java/safeluck/drive/evaluation/app.java | 96 +++++++++++-------------------------------------
1 files changed, 22 insertions(+), 74 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/app.java b/app/src/main/java/safeluck/drive/evaluation/app.java
index 6465d57..b346f70 100644
--- a/app/src/main/java/safeluck/drive/evaluation/app.java
+++ b/app/src/main/java/safeluck/drive/evaluation/app.java
@@ -1,6 +1,7 @@
package safeluck.drive.evaluation;
import android.app.Application;
+import android.text.TextUtils;
import android.widget.Toast;
@@ -16,6 +17,9 @@
import com.anyun.exam.lib.crash.CrashHandler;
import com.facebook.stetho.Stetho;
import com.google.gson.Gson;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
import org.json.JSONException;
@@ -27,6 +31,8 @@
import safeluck.drive.evaluation.DB.failitems.FailedProjRepository;
import safeluck.drive.evaluation.DB.rtktb.RTKConfig;
import safeluck.drive.evaluation.DB.rtktb.RTKWorkRepository;
+import safeluck.drive.evaluation.cEventCenter.CEvent;
+import safeluck.drive.evaluation.cEventCenter.CEventCenter;
import safeluck.drive.evaluation.util.FileUtil;
import safeluck.drive.evaluation.util.SystemUtil;
@@ -67,17 +73,7 @@
Stetho.initializeWithDefaults(this);
- //RTK閰嶇疆淇℃伅
-// rtkConfig = new RTKConfig();
-// rtkConfig.setCity(12);
-// rtkConfig.setImei("460123874561");
-// rtkConfig.setInterval(1);
-// rtkConfig.setIp("47.93.80.84");
-// rtkConfig.setModel("123");
-// rtkConfig.setPhone("2019101500000001");
-// rtkConfig.setPort(12125);
-// rtkConfig.setProvince(23);
-// rtkConfig.setSn("2019101500000001");
+
//鏁版嵁搴撴搷浣�
MyLog.i(TAG, "onCreate111");
failedProjRepository = new FailedProjRepository(this);
@@ -104,70 +100,34 @@
MyLog.d(TAG, String.format("鏀跺埌鍛戒护[%d],Json鍐呭涓�%s", cmd, json));
switch (cmd) {
case Constant.NDK_START:
- Toast.makeText(this, "NDK start", Toast.LENGTH_SHORT).show();
+
break;
case Constant.RTK_PLATFORM_REGISTER_STATUS:
+ //RTK骞冲彴娉ㄥ唽鐘舵�侊紝闇�瑕佷繚瀛樻暟鎹簱
+ CEventCenter.dispatchEvent(Constant.BIND_CONNECT_RTK_TOPIC,cmd,0,json);
- failedProjRepository.insert(new FailedProj(Constant.SUBJECT_I, cmd + random.nextInt(26), Constant.TEST_STU_ID));
- rtkConfig = rtkWorkRepository.getRTKConfigNoLive();
-
- try {
- JSONObject jsonObject = new JSONObject(json);
- String rtkLoginPwd = jsonObject.getString("password");
- int reg_code = jsonObject.getInt("register_code");
- rtkConfig.setPassword(rtkLoginPwd);
- rtkConfig.setRegistered(reg_code);
- } catch (JSONException e) {
- e.printStackTrace();
- }
- rtkWorkRepository.insertRTKConfig(rtkConfig);
break;
case Constant.RTK_PLATFORM_REGISTER_RESULT:
- failedProjRepository.insert(new FailedProj(Constant.SUBJECT_I, cmd + random.nextInt(26), Constant.TEST_STU_ID));
-
- try {
- JSONObject jsonObject = new JSONObject(json);
- int rtklogincode = jsonObject.getInt("login_code");
- rtkConfig.setRegistered(rtklogincode);
- } catch (JSONException e) {
- e.printStackTrace();
- }
+ //RTK骞冲彴鐧诲綍缁撴灉
+ CEventCenter.dispatchEvent(Constant.BIND_CONNECT_RTK_TOPIC,cmd,0,json);
break;
case Constant.FETCH_RTK_PLATFORM_INFO:
- rtkConfig = rtkWorkRepository.getRTKConfigNoLive();
- if (gson == null) {
- gson = new Gson();
- }
- if (rtkConfig==null){
-
- rtkConfig = rtkWorkRepository.getRTKConfigNoLive();
- }
- if (rtkConfig != null){
- String rtkjson = gson.toJson(rtkConfig);
- MyLog.i(TAG, "RTK閰嶇疆淇℃伅锛�" + rtkjson);
-
- //鍘婚櫎id瀛楁
- JSONObject jsonObject = null;
- try {
- jsonObject = new JSONObject(rtkjson);
- } catch (JSONException e) {
- e.printStackTrace();
- }
- jsonObject.remove("_id");
- rtkjson = null;
- rtkjson = jsonObject.toString();
- MyLog.i(TAG, "RTK閰嶇疆淇℃伅锛�" + rtkjson);
- AYSdk.getInstance().sendCmd(Constant.PUSH_RTK_PLATFORM_INFO, rtkjson);
- }
-
+ CEventCenter.dispatchEvent(Constant.BIND_RTKCONFIG_TOPIC,cmd,0,"");
break;
case Constant.JUDGE_INFO:
+ if(!TextUtils.isEmpty(json)){
+ JsonArray jsonArray = JsonParser.parseString(json).getAsJsonArray();
+ for (int i = 0; i < jsonArray.size(); i++) {
+ JsonObject jsonObject = jsonArray.get(i).getAsJsonObject();
+ int emp_id = jsonObject.get("wrong_id").getAsInt();
- failedProjRepository.insert(new FailedProj(Constant.SUBJECT_I, cmd, Constant.TEST_STU_ID));
+ failedProjRepository.insert(new FailedProj(Constant.SUBJECT_I, emp_id, Constant.TEST_STU_ID));
+ }
+ }
break;
case Constant.EXAM_STATUS_REPLY:
@@ -175,20 +135,8 @@
failedProjRepository.deleteAll();
break;
case Constant.RTK_PLATFORM_CONNECT_STATUS:
- rtkConfig = rtkWorkRepository.getRTKConfigNoLive();
- try {
- JSONObject jsonObject3 = new JSONObject(json);
- String ip = jsonObject3.getString("ip");
- int port = jsonObject3.getInt("port");
- int reg_code = jsonObject3.getInt("connected");
- rtkConfig.setRegistered(reg_code);
- rtkConfig.setIp(ip);
- rtkConfig.setPort(port);
- } catch (JSONException e) {
- e.printStackTrace();
- }
- rtkWorkRepository.insertRTKConfig(rtkConfig);
+ CEventCenter.dispatchEvent(Constant.BIND_CONNECT_RTK_TOPIC,cmd,0,json);
break;
case Constant.FETCH_MAP_INFO:
--
Gitblit v1.8.0