From 2fdddd818820b3b93769723079719ee774239a29 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期一, 13 一月 2020 14:37:28 +0800
Subject: [PATCH] RTK平台连接状态、登录结果保存到数据库；所有连接状态显示在RTK配置页面
---
app/src/main/java/safeluck/drive/evaluation/MainActivity.java | 30 ------------------------------
1 files changed, 0 insertions(+), 30 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/MainActivity.java b/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
index 0db08b7..a63aff3 100644
--- a/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
+++ b/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
@@ -48,8 +48,6 @@
private RTKConfig mRTKConfig;//RTK閰嶇疆淇℃伅
private Gson gson = new Gson();
String[] PERMISSIONS = new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA};
- RTKConnAndLoginViewModel rtkConnAndLoginViewModel;
- RTKConnAndLogin rtkConnAndLogin;
RTKConfigViewModel rtkConfigViewModel;
private ICEventListener icEventListener = new ICEventListener() {
@@ -74,32 +72,6 @@
} else {
MyLog.d(TAG, "RTKConfig鏈彇鍒版暟鎹�");
}
- }
- if (msgCode == Constant.RTK_PLATFORM_CONNECT_STATUS || msgCode == Constant.RTK_PLATFORM_REGISTER_RESULT) {
- if (msgCode == Constant.RTK_PLATFORM_REGISTER_RESULT) {
- try {
- JSONObject jsonObject3 = new JSONObject((String) obj);
- int loginCode = jsonObject3.getInt("login_code");
- MyLog.d(TAG, "RTK骞冲彴鐧诲綍缁撴灉锛�" + loginCode);
- rtkConnAndLogin.setLogin_code(loginCode);
-
- } catch (JSONException e) {
- e.printStackTrace();
- }
-
- } else {
- try {
- JSONObject jsonObject3 = new JSONObject((String) obj);
- int connect_status = jsonObject3.getInt("connected");
- MyLog.i(TAG, "RTK骞冲彴杩炴帴鐘舵�侊細" + connect_status);
- rtkConnAndLogin.setLogin_code(connect_status);
-
- } catch (JSONException e) {
- e.printStackTrace();
- }
-
- }
- rtkConnAndLoginViewModel.getRtkConnAndLogin().postValue(rtkConnAndLogin);
}
if (msgCode == Constant.RTK_PLATFORM_REGISTER_STATUS) {
try {
@@ -149,8 +121,6 @@
}
});
- rtkConnAndLoginViewModel = ViewModelProviders.of(this).get(RTKConnAndLoginViewModel.class);
- rtkConnAndLogin = new RTKConnAndLogin();
mPermissionsManager = new PermissionManager(this) {
--
Gitblit v1.8.0