From de1edc7ad9dec23564e13c600683a2140965661e Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期一, 16 三月 2020 13:44:48 +0800
Subject: [PATCH] 优化app.java代码，防止RTK配置发两次；MCU协处理器升级以Worker的形势进行，防止多个入口升级，升级之后会删除dfu.bin,加入dfu.bin不存在的话给出提示；
---
app/src/main/java/safeluck/drive/evaluation/MainActivity.java | 34 ++--------------------------------
1 files changed, 2 insertions(+), 32 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/MainActivity.java b/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
index f7124bb..3526318 100644
--- a/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
+++ b/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
@@ -77,15 +77,12 @@
private Gson gson = new Gson();
String[] PERMISSIONS = new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA};
RTKConfigViewModel rtkConfigViewModel;
- private boolean onlySendOnceRTKConfig = true;
private ICEventListener icEventListener = new ICEventListener() {
@Override
public void onCEvent(String topic, int msgCode, int resultCode, Object obj) {
- if (msgCode == Constant.FETCH_RTK_PLATFORM_INFO) {
-// sendRtkConfigInfo();
- }
+
if (msgCode == Constant.RTK_PLATFORM_REGISTER_STATUS) {
try {
JSONObject jsonObject = new JSONObject((String) obj);
@@ -103,11 +100,7 @@
e.printStackTrace();
}
}
- if (msgCode == Constant.NDK_START){
- MyLog.i(TAG,"NDK_start");
-// sendRtkConfigInfo();
- sendMcuUprgrade();
- }
+
}
};
private List<SignalConfigRemote> signalConfiglist = new ArrayList<>();
@@ -136,27 +129,6 @@
}
-// private void sendRtkConfigInfo() {
-// if (mRTKConfig != null) {
-// String rtkjson = gson.toJson(mRTKConfig);
-//
-// //鍘婚櫎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);
-// } else {
-// MyLog.d(TAG, "RTKConfig鏈彇鍒版暟鎹�");
-// onlySendOnceRTKConfig = true;
-// }
-// }
public ExamPlatformModel examPlatformModel;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -267,7 +239,6 @@
loadRootFragment(R.id.fl_container, HomeFragment.newInstance());
}
- CEventCenter.onBindEvent(true, icEventListener, Constant.BIND_RTKCONFIG_TOPIC);//鍙戦�乺tk閰嶇疆娑堟伅
CEventCenter.onBindEvent(true, icEventListener, Constant.BIND_CONNECT_RTK_TOPIC);//鏀跺埌rtk杩炴帴 鐧诲綍缁撴灉
}
@@ -275,7 +246,6 @@
@Override
protected void onDestroy() {
super.onDestroy();
- CEventCenter.onBindEvent(false, icEventListener, Constant.BIND_RTKCONFIG_TOPIC);
CEventCenter.onBindEvent(false, icEventListener, Constant.BIND_CONNECT_RTK_TOPIC);
Log.i(TAG, "onDestroy: ");
--
Gitblit v1.8.0