From 2ccd3e37ca45696383d724b15c9109277c6c233f Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期四, 09 一月 2020 14:23:59 +0800
Subject: [PATCH] 1.增减rtf配置信息数据库表；2.rtkConfigFragment可以配置rtf平台ip/port/cityid/proviceid/phone;3,student表只有一个1001默认测试学员必须有
---
app/src/main/java/safeluck/drive/evaluation/app.java | 87 ++++++++++++++++++++++++++++++++++---------
1 files changed, 68 insertions(+), 19 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/app.java b/app/src/main/java/safeluck/drive/evaluation/app.java
index ee68c5c..8b384a0 100644
--- a/app/src/main/java/safeluck/drive/evaluation/app.java
+++ b/app/src/main/java/safeluck/drive/evaluation/app.java
@@ -1,8 +1,6 @@
package safeluck.drive.evaluation;
import android.app.Application;
-import android.os.Handler;
-import android.util.Log;
import android.widget.Toast;
@@ -27,8 +25,8 @@
import safeluck.drive.evaluation.DB.failitems.FailedProj;
import safeluck.drive.evaluation.DB.failitems.FailedProjRepository;
-import safeluck.drive.evaluation.bean.RTKConfig;
-import safeluck.drive.evaluation.cEventCenter.CEventCenter;
+import safeluck.drive.evaluation.DB.rtktb.RTKConfig;
+import safeluck.drive.evaluation.DB.rtktb.RTKWorkRepository;
import safeluck.drive.evaluation.util.SystemUtil;
/**
@@ -42,7 +40,8 @@
private static final String TAG = "app";
private Gson gson;
RTKConfig rtkConfig;
- FailedProjRepository failedProjRepository;
+ FailedProjRepository failedProjRepository;//澶辫触椤圭洰琛ㄦ暟鎹簱
+ RTKWorkRepository rtkWorkRepository;//淇濆瓨RTK閰嶇疆琛�
Random random = new Random();
@Override
@@ -68,19 +67,20 @@
//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");
+// 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);
+ rtkWorkRepository = new RTKWorkRepository(this);
}
}
@@ -106,7 +106,10 @@
Toast.makeText(this, "NDK start", Toast.LENGTH_SHORT).show();
break;
case Constant.RTK_PLATFORM_REGISTER_STATUS:
- failedProjRepository.insert(new FailedProj(Constant.SUBJECT_I, cmd + random.nextInt(30), Constant.TEST_STU_ID));
+
+ 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");
@@ -116,19 +119,49 @@
} 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(30), Constant.TEST_STU_ID));
+ 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();
+ }
break;
case Constant.FETCH_RTK_PLATFORM_INFO:
+ rtkConfig = rtkWorkRepository.getRTKConfigNoLive();
if (gson == null) {
gson = new Gson();
}
- MyLog.i(TAG, "RTK閰嶇疆淇℃伅锛�" + gson.toJson(rtkConfig));
- AYSdk.getInstance().sendCmd(Constant.PUSH_RTK_PLATFORM_INFO, gson.toJson(rtkConfig));
+ 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);
+ }
+
break;
case Constant.JUDGE_INFO:
@@ -140,6 +173,22 @@
MyLog.d(TAG, "鑰冭瘯寮�濮嬶紝闇�瑕佸垹闄や笂涓�涓�冭瘯瀛﹀憳鐨勬暟鎹簱澶辫触椤圭洰琛�");
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);
+ break;
}
}
--
Gitblit v1.8.0