From 1b7c87b81313bca47a6847f203be329a63decff3 Mon Sep 17 00:00:00 2001
From: yy1717 <fctom1215@outlook.com>
Date: 星期四, 16 四月 2020 18:15:05 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/endian11/DriveJudge
---
app/src/main/java/safeluck/drive/evaluation/fragment/SetArgumentsFragment.java | 58 +++++++++++++++++++++++++---------------------------------
1 files changed, 25 insertions(+), 33 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/SetArgumentsFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/SetArgumentsFragment.java
index 04a064f..8d77325 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/SetArgumentsFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/SetArgumentsFragment.java
@@ -97,24 +97,21 @@
View view = inflater.inflate(R.layout.layout_base_datas, container, false);
initView(view);
rtkConfigViewModel= ViewModelProviders.of(this).get(RTKConfigViewModel.class);
- rtkConfigViewModel.getRTKConfig().observe(this, new Observer<RTKConfig>() {
- @Override
- public void onChanged(RTKConfig rtkConfig) {
- if (rtkConfig != null){
- Log.i(TAG, "RTKConfig Changed: "+rtkConfig.toString());
- mRtkConfig = rtkConfig;
- et_ip_rtk.setText(rtkConfig.getIp());
- et_city_id.setText(String.valueOf(rtkConfig.getCity()));
- et_city_province.setText(String.valueOf(rtkConfig.getProvince()));
- et_port_rtk.setText(String.valueOf(rtkConfig.getPort()));
- et_phone.setText(rtkConfig.getPhone());
- ExamPlatformData.getInstance().setRTKPort(rtkConfig.getPort());
- ExamPlatformData.getInstance().setRTKIP(rtkConfig.getIp());
-
- }
-
+ rtkConfigViewModel.getRTKConfig().observe(this, rtkConfig -> {
+ if (rtkConfig != null){
+ Log.i(TAG, "RTKConfig Changed: "+rtkConfig.toString());
+ mRtkConfig = rtkConfig;
+ et_ip_rtk.setText(rtkConfig.getIp());
+ et_city_id.setText(String.valueOf(rtkConfig.getCity()));
+ et_city_province.setText(String.valueOf(rtkConfig.getProvince()));
+ et_port_rtk.setText(String.valueOf(rtkConfig.getPort()));
+ et_phone.setText(rtkConfig.getPhone());
+ ExamPlatformData.getInstance().setRTKPort(rtkConfig.getPort());
+ ExamPlatformData.getInstance().setRTKIP(rtkConfig.getIp());
}
+
+
});
@@ -279,16 +276,15 @@
final Uri uri= data.getData();
Log.i(TAG, "onActivityResult: "+uri.getPath());
ExamPlatformData.getInstance().setNewMapPath(uri.getPath());
- CThreadPoolExecutor.runInBackground(new Runnable() {
- @Override
- public void run() {
+ CThreadPoolExecutor.runInBackground(()-> {
+
byte[] fileContent = FileUtil.readFile(uri.getPath());
if (fileContent != null){
String str = new String(fileContent);
Log.i(TAG, "鏂囦欢鍐呭锛�"+str);
AYSdk.getInstance().sendCmd(Constant.PUSH_MAP_INFO,str);
}
- }
+
});
}
@@ -298,16 +294,15 @@
final Uri uri= data.getData();
Log.i(TAG, "onActivityResult: "+uri.getPath());
ExamPlatformData.getInstance().setCarModelPath(uri.getPath());
- CThreadPoolExecutor.runInBackground(new Runnable() {
- @Override
- public void run() {
+ CThreadPoolExecutor.runInBackground(()-> {
+
byte[] fileContent = FileUtil.readFile(uri.getPath());
if (fileContent != null){
String str = new String(fileContent);
Log.i(TAG, "鏂囦欢鍐呭锛�"+str);
AYSdk.getInstance().sendCmd(Constant.PUSH_VECHILE_PROFILE,str);
}
- }
+
});
}
@@ -317,15 +312,12 @@
final Uri uri= data.getData();
Log.i(TAG, "onActivityResult: "+uri.getPath());
ExamPlatformData.getInstance().setNewRoadMapPath(uri.getPath());
- CThreadPoolExecutor.runInBackground(new Runnable() {
- @Override
- public void run() {
- byte[] fileContent = FileUtil.readFile(uri.getPath());
- if (fileContent != null){
- String str = new String(fileContent);
- Log.i(TAG, "鏂囦欢鍐呭锛�"+str);
- AYSdk.getInstance().sendCmd(Constant.PUSH_ROAD_MAP_INFO,str);
- }
+ CThreadPoolExecutor.runInBackground(() -> {
+ byte[] fileContent = FileUtil.readFile(uri.getPath());
+ if (fileContent != null){
+ String str = new String(fileContent);
+ Log.i(TAG, "鏂囦欢鍐呭锛�"+str);
+ AYSdk.getInstance().sendCmd(Constant.PUSH_ROAD_MAP_INFO,str);
}
});
}
--
Gitblit v1.8.0