endian11
2020-01-10 9386cf855cace41b24bce436bb5ed70037a7396e
简化app类,删除RTKConfigDao的getRTKConfigNoLive方法
4个文件已修改
58 ■■■■■ 已修改文件
app/src/main/java/safeluck/drive/evaluation/DB/rtktb/RTKConfigDao.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/DB/rtktb/RTKWorkRepository.java 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/MainActivity.java 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/app.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/DB/rtktb/RTKConfigDao.java
@@ -19,6 +19,5 @@
    @Update
    void update(RTKConfig rtkConfig);
    @Query("SELECT * from rtkconfig_table")
    RTKConfig getRTKConfigNoLive();
}
app/src/main/java/safeluck/drive/evaluation/DB/rtktb/RTKWorkRepository.java
@@ -12,18 +12,10 @@
    private static final String TAG = "RTKWorkRepository";
    private RTKConfigDao rtkConfigDao;
    private LiveData<RTKConfig> rtkConfig;
    private RTKConfig rtkConfig1;
    public RTKWorkRepository(Application application) {
        rtkConfigDao = WorkRoomDataBase.getWorkRoomDataBase(application).getRTKConfigDao();
        rtkConfig = rtkConfigDao.getRTKConfig();
        WorkRoomDataBase.dataBaseWriteExecutor.execute(new Runnable() {
            @Override
            public void run() {
                MyLog.d(TAG,"获取RTK配置信息表");
                rtkConfig1 = rtkConfigDao.getRTKConfigNoLive();
            }
        });
    }
@@ -49,16 +41,5 @@
        });
    }
    public RTKConfig getRTKConfigNoLive() {
        if (rtkConfig1 == null){
            WorkRoomDataBase.dataBaseWriteExecutor.execute(new Runnable() {
                @Override
                public void run() {
                    MyLog.d(TAG,"再次获取RTK配置信息表");
                    rtkConfig1 = rtkConfigDao.getRTKConfigNoLive();
                }
            });
        }
        return rtkConfig1;
    }
}
app/src/main/java/safeluck/drive/evaluation/MainActivity.java
@@ -50,6 +50,7 @@
    String[] PERMISSIONS = new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.CAMERA};
    RTKConnAndLoginViewModel rtkConnAndLoginViewModel;
    RTKConnAndLogin rtkConnAndLogin;
    RTKConfigViewModel rtkConfigViewModel;
    private ICEventListener icEventListener = new ICEventListener() {
        @Override
@@ -100,6 +101,23 @@
                }
                rtkConnAndLoginViewModel.getRtkConnAndLogin().postValue(rtkConnAndLogin);
            }
            if (msgCode == Constant.RTK_PLATFORM_REGISTER_STATUS) {
                try {
                    JSONObject jsonObject = new JSONObject((String) obj);
                    String rtkLoginPwd = jsonObject.getString("password");
                    int reg_code = jsonObject.getInt("register_code");
                    if (mRTKConfig != null) {
                        mRTKConfig.setPassword(rtkLoginPwd);
                        mRTKConfig.setRegistered(reg_code);
                        rtkConfigViewModel.insertRTKConfig(mRTKConfig);
                    }else{
                        MyLog.i(TAG,"mRTKConfig == null");
                    }
                } catch (JSONException e) {
                    e.printStackTrace();
                }
            }
        }
    };
@@ -121,7 +139,7 @@
            }
        });
        RTKConfigViewModel rtkConfigViewModel= ViewModelProviders.of(this).get(RTKConfigViewModel.class);
        rtkConfigViewModel  = ViewModelProviders.of(this).get(RTKConfigViewModel.class);
        rtkConfigViewModel.getRTKConfig().observe(this, new Observer<RTKConfig>() {
            @Override
            public void onChanged(RTKConfig rtkConfig) {
@@ -160,8 +178,6 @@
            }
        };
        MyLog.i(TAG,"onCreate");
app/src/main/java/safeluck/drive/evaluation/app.java
@@ -104,18 +104,8 @@
                break;
            case Constant.RTK_PLATFORM_REGISTER_STATUS:
                //RTK平台注册状态,需要保存数据库
                rtkConfig = rtkWorkRepository.getRTKConfigNoLive();
                CEventCenter.dispatchEvent(Constant.BIND_CONNECT_RTK_TOPIC,cmd,0,json);
                try {
                    JSONObject jsonObject = new JSONObject(json);
                    String rtkLoginPwd = jsonObject.getString("password");
                    int reg_code = jsonObject.getInt("register_code");
                    rtkConfig.setPassword(rtkLoginPwd);
                    rtkConfig.setRegistered(reg_code);
                } catch (JSONException e) {
                    e.printStackTrace();
                }
                rtkWorkRepository.insertRTKConfig(rtkConfig);
                break;
            case Constant.RTK_PLATFORM_REGISTER_RESULT: