From c18de19b7c31f8f3436ece05378e07d089cf6b09 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期三, 08 一月 2020 13:59:38 +0800
Subject: [PATCH] 修改rtk平台信息
---
app/src/main/java/safeluck/drive/evaluation/app.java | 39 +++++++++++++++++++++++++++++++++++----
1 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/app.java b/app/src/main/java/safeluck/drive/evaluation/app.java
index 9e4bb24..87d6bb6 100644
--- a/app/src/main/java/safeluck/drive/evaluation/app.java
+++ b/app/src/main/java/safeluck/drive/evaluation/app.java
@@ -18,8 +18,12 @@
import com.google.gson.Gson;
+import org.json.JSONException;
+import org.json.JSONObject;
+
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.util.FileUtil;
import safeluck.drive.evaluation.util.SystemUtil;
@@ -34,7 +38,7 @@
private static final String TAG = "app";
private Gson gson;
-
+ RTKConfig rtkConfig;
@Override
public void onCreate() {
super.onCreate();
@@ -56,6 +60,18 @@
Log.i(TAG, "onCreate: ");
MyLog.createIfNotExist();
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");
}
}
@@ -80,10 +96,25 @@
case Constant.NDK_START:
Toast.makeText(this, "NDK start", Toast.LENGTH_SHORT).show();
break;
+ case Constant.RTK_PLATFORM_REGISTER_STATUS:
+ try {
+ JSONObject jsonObject = new JSONObject();
+ int reg_code = jsonObject.getInt("register_code");
+ String rtkLoginPwd = jsonObject.getString("password");
+ rtkConfig.setPassword(rtkLoginPwd);
+ rtkConfig.setRegistered(reg_code);
+ } catch (JSONException e) {
+ e.printStackTrace();
+ }
+ break;
+ case Constant.RTK_PLATFORM_REGISTER_RESULT:
+ break;
case Constant.FETCH_RTK_PLATFORM_INFO:
- StringBuffer stringBuffer = FileUtil.readAssetTxtFile(getApplicationContext(),Constant.RTK_CONFIG_JSON);
- MyLog.i(TAG, "RTK閰嶇疆淇℃伅锛�"+stringBuffer.toString());
- AYSdk.getInstance().sendCmd(Constant.PUSH_RTK_PLATFORM_INFO,stringBuffer.toString());
+ if (gson == null){
+ gson = new Gson();
+ }
+ MyLog.i(TAG, "RTK閰嶇疆淇℃伅锛�"+gson.toJson(rtkConfig));
+ AYSdk.getInstance().sendCmd(Constant.PUSH_RTK_PLATFORM_INFO,gson.toJson(rtkConfig));
break;
case Constant.JUDGE_INFO:
FailedProjRepository failedProjRepository = new FailedProjRepository(this);
--
Gitblit v1.8.0