按照规则根据协处理器给的sn修改imei和phone；系统设置->基础数据用文字表述RTK平台状态和考试平台状态

lizhanwei

2020-03-10 2fb664e451402172d6a53eea5ed7a541055ca7bb

按照规则根据协处理器给的sn修改imei和phone；系统设置->基础数据用文字表述RTK平台状态和考试平台状态

 app/src/main/java/safeluck/drive/evaluation/DB/rtktb/RTKConfigUpdateWorker.kt

@@ -25,8 +25,15 @@
            jsonObject = JSONObject(data)
            sn = jsonObject.getString(Constant.RTK_CONFIG_SN)
            Log.i(TAG,"sn="+sn)
            imei = sn
            phone = sn
            imei = sn.substring(1)
            Log.i(TAG,"imei="+imei)
            /**
             * SN与电话号码的关系（以AYKJ-4为例）：
            0311200200000011，前4位是设备编码，接下来4位是年月，后面8位是流水号；
            电话号码前2位固定13，第三位取SN的第4位，第4-7位取SN的年月，第8-11位取SN流水号的后4位；即13120020011
             */
            phone = "13"+sn.subSequence(3,8)+sn.substring(sn.length-4,sn.length)
            Log.i(TAG,"phone="+phone)
        }
        var rtkConfigDao = WorkRoomDataBase.getWorkRoomDataBase(applicationContext).rtkConfigDao.also {
            it.update(sn, imei, phone)

 app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java

@@ -104,14 +104,14 @@
                                    if (mRtkConfig != null){
                                        datas.add("省ID："+mRtkConfig.getProvince());
                                        datas.add("市ID："+mRtkConfig.getCity());
                                        datas.add("电话："+mRtkConfig.getSn());
                                        datas.add("电话："+mRtkConfig.getPhone());
                                        datas.add("RTK平台地址："+mRtkConfig.getIp()+":"+mRtkConfig.getPort());

                                        datas.add("考试平台地址："+ExamPlatformData.getInstance().getPlatformIP()+":"+ExamPlatformData.getInstance().getPlatformPort());
                                    }
                                    if (appStatus != null){
                                        datas.add("RTK平台状态："+appStatus.getRtk_connect_status());
                                        datas.add("考试平台状态："+appStatus.getRtk_connect_status());
                                        datas.add("RTK平台状态："+(appStatus.getRtk_connect_status()==1?(appStatus.getRtk_login_code()==0?"已登录":"未登录"):"未连接"));
                                        datas.add("考试平台状态："+ExamPlatformData.getInstance().getExamplatformStatusStr(ExamPlatformData.getInstance().getExamplatformStatus()));
                                    }
                                    gpsInfoAdapter.addAll(datas);
                                }

 app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java

@@ -156,6 +156,7 @@
                        item_conents.add(f.getItem_content());
                        Collections.reverse(mArrayList);
                        mScoreAdapter.addDatas(mArrayList);
                        MyLog.i("item_score="+item_id);
                    }
                    //TODO 发送JKMessage0203 给平台，这儿有点复杂，看怎么处理
                    sendJKMessage0203(failedProj_selects);

 app/src/main/res/values/strings.xml

@@ -51,4 +51,8 @@
    <string name="add_subtract">加减档</string>
    <string name="by_crossing">通过路口</string>
    <string name="lane_change">变更车道</string>
    <array name="simulate_light_tips">
        <item>下面将进行模拟夜间行驶场景灯光使用的考试，请按语音指令在5秒内做出相应的灯光操作</item>
        <item>模拟夜间考试完成请关闭所有灯光，请起步继续完成考试</item>
    </array>
</resources>