From f06688c2481626bdf5aa6d98b2354bed207671ea Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期一, 16 三月 2020 11:12:20 +0800
Subject: [PATCH] 状态栏显示时间（最大有10s的误差）
---
im_lib/src/main/java/com/anyun/im_lib/util/ByteUtil.java | 2 +-
app/src/main/java/safeluck/drive/evaluation/util/FileUtil.java | 2 +-
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java | 9 +++++++++
app/src/main/java/safeluck/drive/evaluation/viewmodels/TimeViewModel.kt | 2 ++
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java | 9 +++++++++
5 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
index 5ec7624..b51e494 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
@@ -68,6 +68,7 @@
import safeluck.drive.evaluation.platformMessage.JKMessage0203;
import safeluck.drive.evaluation.platformMessage.JKMessage0204;
import safeluck.drive.evaluation.util.Utils;
+import safeluck.drive.evaluation.viewmodels.TimeViewModel;
import safeluck.drive.evaluation.worker.TimeWorker;
import static androidx.work.PeriodicWorkRequest.MIN_PERIODIC_INTERVAL_MILLIS;
@@ -373,6 +374,14 @@
}
});
+ TimeViewModel timeViewModel = ViewModelProviders.of(this).get(TimeViewModel.class);
+ timeViewModel.getLiveDataTime().observe(this, new Observer<String>() {
+ @Override
+ public void onChanged(String s) {
+ tv_network_time.setText(s);
+ }
+ });
+
return view;
}
private List<Integer> sns =new ArrayList<>();
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
index 1b966cb..f237d16 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
@@ -72,6 +72,7 @@
import safeluck.drive.evaluation.platformMessage.JKMessage0203;
import safeluck.drive.evaluation.platformMessage.JKMessage0204;
import safeluck.drive.evaluation.util.Utils;
+import safeluck.drive.evaluation.viewmodels.TimeViewModel;
import safeluck.drive.evaluation.worker.TimeWorker;
import static androidx.work.PeriodicWorkRequest.MIN_PERIODIC_INTERVAL_MILLIS;
@@ -378,6 +379,14 @@
}
});
+ TimeViewModel timeViewModel = ViewModelProviders.of(this).get(TimeViewModel.class);
+ timeViewModel.getLiveDataTime().observe(this, new Observer<String>() {
+ @Override
+ public void onChanged(String s) {
+ tv_network_time.setText(s);
+ }
+ });
+
return view;
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/util/FileUtil.java b/app/src/main/java/safeluck/drive/evaluation/util/FileUtil.java
index c0e8ed0..49fa4d9 100644
--- a/app/src/main/java/safeluck/drive/evaluation/util/FileUtil.java
+++ b/app/src/main/java/safeluck/drive/evaluation/util/FileUtil.java
@@ -47,7 +47,7 @@
InputStreamReader inputStreamReader = new InputStreamReader(inputStream);
BufferedReader bufferedReader = new BufferedReader(inputStreamReader);
while((lineTxt = bufferedReader.readLine()) != null){
- System.out.println(lineTxt);
+// System.out.println(lineTxt);
stringBuffer.append(lineTxt);
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/viewmodels/TimeViewModel.kt b/app/src/main/java/safeluck/drive/evaluation/viewmodels/TimeViewModel.kt
new file mode 100644
index 0000000..15a0f42
--- /dev/null
+++ b/app/src/main/java/safeluck/drive/evaluation/viewmodels/TimeViewModel.kt
@@ -0,0 +1,2 @@
+package safeluck.drive.evaluation.viewmodels
+
diff --git a/im_lib/src/main/java/com/anyun/im_lib/util/ByteUtil.java b/im_lib/src/main/java/com/anyun/im_lib/util/ByteUtil.java
index c66bb4b..00d363b 100644
--- a/im_lib/src/main/java/com/anyun/im_lib/util/ByteUtil.java
+++ b/im_lib/src/main/java/com/anyun/im_lib/util/ByteUtil.java
@@ -73,7 +73,7 @@
byte b = (byte) a;
bbt[p] = b;
}
- Log.i(TAG, "str2Bcd: "+byte2HexStr(bbt));
+// Log.i(TAG, "str2Bcd: "+byte2HexStr(bbt));
return bbt;
}
--
Gitblit v1.8.0