From 118fc07c2a535db723697a43c3330ad7ef49bbf8 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期五, 10 一月 2020 11:20:17 +0800
Subject: [PATCH] 1.收到需要推送rtk配置信息后,在activity里面发送;2.rtk配置信息表 注册装填改为0未注册;3.在联网考试和单车训练界面主动触发推送rtk配置信息

---
 app/src/main/java/safeluck/drive/evaluation/app.java |   37 ++++++-------------------------------
 1 files changed, 6 insertions(+), 31 deletions(-)

diff --git a/app/src/main/java/safeluck/drive/evaluation/app.java b/app/src/main/java/safeluck/drive/evaluation/app.java
index 3e7a830..a2b63fc 100644
--- a/app/src/main/java/safeluck/drive/evaluation/app.java
+++ b/app/src/main/java/safeluck/drive/evaluation/app.java
@@ -31,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;
 
@@ -71,7 +73,7 @@
             Stetho.initializeWithDefaults(this);
 
 
- 
+
             //鏁版嵁搴撴搷浣�
             MyLog.i(TAG, "onCreate111");
             failedProjRepository = new FailedProjRepository(this);
@@ -101,8 +103,7 @@
 
                 break;
             case Constant.RTK_PLATFORM_REGISTER_STATUS:
-
-                failedProjRepository.insert(new FailedProj(Constant.SUBJECT_I, cmd + random.nextInt(26), Constant.TEST_STU_ID));
+                //RTK骞冲彴娉ㄥ唽鐘舵�侊紝闇�瑕佷繚瀛樻暟鎹簱
                 rtkConfig = rtkWorkRepository.getRTKConfigNoLive();
 
                 try {
@@ -118,11 +119,10 @@
                 break;
             case Constant.RTK_PLATFORM_REGISTER_RESULT:
 
-
+                //RTK骞冲彴鐧诲綍缁撴灉
                 try {
                     JSONObject jsonObject = new JSONObject(json);
                     int rtklogincode = jsonObject.getInt("login_code");
-                    rtkConfig.setRegistered(rtklogincode);
                 } catch (JSONException e) {
                     e.printStackTrace();
                 }
@@ -130,32 +130,7 @@
 
                 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:
 

--
Gitblit v1.8.0