From 9386cf855cace41b24bce436bb5ed70037a7396e Mon Sep 17 00:00:00 2001
From: endian11 <Dana_Lee1016@126.com>
Date: 星期五, 10 一月 2020 15:59:06 +0800
Subject: [PATCH] 简化app类，删除RTKConfigDao的getRTKConfigNoLive方法
---
app/src/main/java/safeluck/drive/evaluation/app.java | 12 -----
app/src/main/java/safeluck/drive/evaluation/MainActivity.java | 72 ++++++++++++++++++++++--------------
app/src/main/java/safeluck/drive/evaluation/DB/rtktb/RTKConfigDao.java | 3 -
app/src/main/java/safeluck/drive/evaluation/DB/rtktb/RTKWorkRepository.java | 21 ----------
4 files changed, 47 insertions(+), 61 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/DB/rtktb/RTKConfigDao.java b/app/src/main/java/safeluck/drive/evaluation/DB/rtktb/RTKConfigDao.java
index 85d9de4..e0428c1 100644
--- a/app/src/main/java/safeluck/drive/evaluation/DB/rtktb/RTKConfigDao.java
+++ b/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();
+
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/DB/rtktb/RTKWorkRepository.java b/app/src/main/java/safeluck/drive/evaluation/DB/rtktb/RTKWorkRepository.java
index 4f67f92..60d2280 100644
--- a/app/src/main/java/safeluck/drive/evaluation/DB/rtktb/RTKWorkRepository.java
+++ b/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;
- }
+
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/MainActivity.java b/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
index 6784417..0db08b7 100644
--- a/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
+++ b/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
@@ -47,15 +47,16 @@
private PermissionManager mPermissionsManager;
private RTKConfig mRTKConfig;//RTK閰嶇疆淇℃伅
private Gson gson = new Gson();
- String[] PERMISSIONS = new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.CAMERA};
+ String[] PERMISSIONS = new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA};
RTKConnAndLoginViewModel rtkConnAndLoginViewModel;
RTKConnAndLogin rtkConnAndLogin;
+ RTKConfigViewModel rtkConfigViewModel;
private ICEventListener icEventListener = new ICEventListener() {
@Override
public void onCEvent(String topic, int msgCode, int resultCode, Object obj) {
- if (msgCode == Constant.FETCH_RTK_PLATFORM_INFO){
- if (mRTKConfig != null){
+ if (msgCode == Constant.FETCH_RTK_PLATFORM_INFO) {
+ if (mRTKConfig != null) {
String rtkjson = gson.toJson(mRTKConfig);
//鍘婚櫎id瀛楁
@@ -70,27 +71,27 @@
rtkjson = jsonObject.toString();
MyLog.i(TAG, "RTK閰嶇疆淇℃伅锛�" + rtkjson);
AYSdk.getInstance().sendCmd(Constant.PUSH_RTK_PLATFORM_INFO, rtkjson);
- }else{
- MyLog.d(TAG,"RTKConfig鏈彇鍒版暟鎹�");
+ } else {
+ MyLog.d(TAG, "RTKConfig鏈彇鍒版暟鎹�");
}
}
- if (msgCode == Constant.RTK_PLATFORM_CONNECT_STATUS||msgCode== Constant.RTK_PLATFORM_REGISTER_RESULT){
- if (msgCode == Constant.RTK_PLATFORM_REGISTER_RESULT){
+ if (msgCode == Constant.RTK_PLATFORM_CONNECT_STATUS || msgCode == Constant.RTK_PLATFORM_REGISTER_RESULT) {
+ if (msgCode == Constant.RTK_PLATFORM_REGISTER_RESULT) {
try {
JSONObject jsonObject3 = new JSONObject((String) obj);
int loginCode = jsonObject3.getInt("login_code");
- MyLog.d(TAG,"RTK骞冲彴鐧诲綍缁撴灉锛�"+loginCode);
+ MyLog.d(TAG, "RTK骞冲彴鐧诲綍缁撴灉锛�" + loginCode);
rtkConnAndLogin.setLogin_code(loginCode);
} catch (JSONException e) {
e.printStackTrace();
}
- }else{
+ } else {
try {
JSONObject jsonObject3 = new JSONObject((String) obj);
int connect_status = jsonObject3.getInt("connected");
- MyLog.i(TAG,"RTK骞冲彴杩炴帴鐘舵�侊細"+connect_status);
+ MyLog.i(TAG, "RTK骞冲彴杩炴帴鐘舵�侊細" + connect_status);
rtkConnAndLogin.setLogin_code(connect_status);
} catch (JSONException e) {
@@ -99,6 +100,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();
+ }
}
}
};
@@ -114,24 +132,24 @@
wokViewModel.getStudents().observe(this, new Observer<List<Student>>() {
@Override
public void onChanged(List<Student> students) {
- for (Student student:
+ for (Student student :
students) {
- Log.i(TAG, "onChanged: "+student.toString());
+ Log.i(TAG, "onChanged: " + student.toString());
}
}
});
- 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) {
- MyLog.i(TAG, "RTKConfig Changed: "+(rtkConfig!=null?rtkConfig.toString():"null"));
+ MyLog.i(TAG, "RTKConfig Changed: " + (rtkConfig != null ? rtkConfig.toString() : "null"));
mRTKConfig = rtkConfig;
}
});
- rtkConnAndLoginViewModel= ViewModelProviders.of(this).get(RTKConnAndLoginViewModel.class);
+ rtkConnAndLoginViewModel = ViewModelProviders.of(this).get(RTKConnAndLoginViewModel.class);
rtkConnAndLogin = new RTKConnAndLogin();
@@ -145,7 +163,7 @@
public void noAuthorization(int requestCode, String[] lackPermissions) {
AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
builder.setTitle("鎻愮ず");
- builder.setMessage("缂哄皯"+lackPermissions+"鏉冮檺");
+ builder.setMessage("缂哄皯" + lackPermissions + "鏉冮檺");
builder.setPositiveButton("璁剧疆鏉冮檺", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
@@ -162,47 +180,45 @@
};
-
-
- MyLog.i(TAG,"onCreate");
+ MyLog.i(TAG, "onCreate");
MainViewModel mainViewModel = ViewModelProviders.of(this).get(MainViewModel.class);
mainViewModel.getJson().observe(this, new Observer<String>() {
@Override
public void onChanged(@Nullable String json) {
Toast.makeText(MainActivity.this, json, Toast.LENGTH_SHORT).show();
- MyLog.i(TAG,"json=========="+json+" ThreadName:"+Thread.currentThread().getName());
+ MyLog.i(TAG, "json==========" + json + " ThreadName:" + Thread.currentThread().getName());
}
});
//鍔犺浇鏍笷ragment
- if (findFragment(HomeFragment.class) == null){
- loadRootFragment(R.id.fl_container,HomeFragment.newInstance());
+ if (findFragment(HomeFragment.class) == null) {
+ 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杩炴帴 鐧诲綍缁撴灉
+ CEventCenter.onBindEvent(true, icEventListener, Constant.BIND_RTKCONFIG_TOPIC);//鍙戦�乺tk閰嶇疆娑堟伅
+ CEventCenter.onBindEvent(true, icEventListener, Constant.BIND_CONNECT_RTK_TOPIC);//鏀跺埌rtk杩炴帴 鐧诲綍缁撴灉
}
@Override
protected void onDestroy() {
super.onDestroy();
- CEventCenter.onBindEvent(false,icEventListener,Constant.BIND_RTKCONFIG_TOPIC);
+ CEventCenter.onBindEvent(false, icEventListener, Constant.BIND_RTKCONFIG_TOPIC);
- CEventCenter.onBindEvent(false,icEventListener, Constant.BIND_CONNECT_RTK_TOPIC);
+ CEventCenter.onBindEvent(false, icEventListener, Constant.BIND_CONNECT_RTK_TOPIC);
Log.i(TAG, "onDestroy: ");
}
@Override
protected void onResume() {
super.onResume();
- mPermissionsManager.checkPermissions(PERMISSIONS_REQUEST_CODE,PERMISSIONS);
+ mPermissionsManager.checkPermissions(PERMISSIONS_REQUEST_CODE, PERMISSIONS);
}
@Override
public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
- mPermissionsManager.recheckPermissions(PERMISSIONS_REQUEST_CODE,permissions,grantResults);
+ mPermissionsManager.recheckPermissions(PERMISSIONS_REQUEST_CODE, permissions, grantResults);
}
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/app.java b/app/src/main/java/safeluck/drive/evaluation/app.java
index dee03d5..b346f70 100644
--- a/app/src/main/java/safeluck/drive/evaluation/app.java
+++ b/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:
--
Gitblit v1.8.0