lizhanwei
2020-03-10 f16cc04f5be09aa4e1521462e6c66836428cec9e
app/src/main/java/safeluck/drive/evaluation/MainActivity.java
@@ -198,6 +198,7 @@
                MyLog.i(TAG, "RTKConfig Changed: " + (rtkConfig != null ? rtkConfig.toString() : "null"));
                mRTKConfig = rtkConfig;
                ExamPlatformData.getInstance().setPhone(rtkConfig.getPhone());
                synchronized (MainActivity.this){
                    if (onlySendOnceRTKConfig){
                        MyLog.i(TAG,"进入 synchronized (MainActivity.this)");
@@ -337,18 +338,22 @@
    @Override
    public void onConnected() {
        ExamPlatformData.getInstance().setExamplatformStatus(ExamPlatformData.TCP_CONNECTED);
        MyLog.i(TAG,"TCP连接成功");
        MyLog.i("TCP连接成功");
        //TODO 判断SPUtils 是否保存有des密码;如果没有则进行注册JKMessage0100,如果有密码则进行鉴权JKMessage0101
        String hexPwd = (String) SPUtils.get(this,SPUtils.DES_HEX_PWD,"");
        MessageProcessor.getInstance().addBeatHeart(10);
        if (TextUtils.isEmpty(hexPwd)){
            JKMessage0100 jkRegisterMessage = new JKMessage0100();
            jkRegisterMessage.proviceid = 23;
            jkRegisterMessage.cityid = 1;
            jkRegisterMessage.imei = "460123874561";
            jkRegisterMessage.model = "123";
            jkRegisterMessage.sn = "0314200100000004";
            if (mRTKConfig!=null){
                jkRegisterMessage.phone = ExamPlatformData.getInstance().getPhone();
                jkRegisterMessage.proviceid = mRTKConfig.getProvince();
                jkRegisterMessage.cityid = mRTKConfig.getCity();
                jkRegisterMessage.imei = mRTKConfig.getImei();
                jkRegisterMessage.model = mRTKConfig.getModel();
                jkRegisterMessage.sn = mRTKConfig.getSn();
            }
            Log.i(TAG, "onClick: msg len "+jkRegisterMessage.getMessageLen()+" "+       jkRegisterMessage.props.value);
            byte[] str = jkRegisterMessage.toBytes();
@@ -356,6 +361,7 @@
            Log.i(TAG, "onClick: "+ BytesUtils.bytesToHexString(str)+" ============");
        }else{
            JKMessage0101 jkMessage0101 = new JKMessage0101();
            jkMessage0101.phone = ExamPlatformData.getInstance().getPhone();
            jkMessage0101.des =hexPwd;
            jkMessage0101.timestamp = (int) System.currentTimeMillis();
            MessageProcessor.getInstance().sendMessage(jkMessage0101);