From 7915395e0199f64fb108f70df18a8df0c08876fb Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期日, 08 三月 2020 23:39:40 +0800
Subject: [PATCH] 修改NetWorkinfo 可能为null的bug
---
app/src/main/java/safeluck/drive/evaluation/app.java | 1 +
app/src/main/java/safeluck/drive/evaluation/im/IMSEventListener.java | 7 ++++++-
app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusViewModel.java | 8 ++++++++
app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusWoker.java | 3 +++
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java | 2 +-
app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java | 7 +++++--
6 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusViewModel.java b/app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusViewModel.java
index f88bd44..1ef2a68 100644
--- a/app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusViewModel.java
+++ b/app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusViewModel.java
@@ -38,4 +38,12 @@
public LiveData<Integer> getStartExam() {
return startExam;
}
+
+ @Override
+ public String toString() {
+ return "ExamStatusViewModel{" +
+ ", examStatus=" + examStatus +
+ ", startExam=" + startExam +
+ '}';
+ }
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusWoker.java b/app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusWoker.java
index 8671173..4a050c9 100644
--- a/app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusWoker.java
+++ b/app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusWoker.java
@@ -8,6 +8,8 @@
import androidx.work.Worker;
import androidx.work.WorkerParameters;
+import com.anyun.exam.lib.MyLog;
+
import org.json.JSONException;
import org.json.JSONObject;
@@ -23,6 +25,7 @@
@Override
public Result doWork() {
String str = getInputData().getString(Constant.exam_enter_exitdata);
+ MyLog.i("鑰冭瘯鐘舵�佹洿鏂帮紝鎻掑叆鏁版嵁搴�="+str);
if (!TextUtils.isEmpty(str)){
JSONObject jsonObject = null;
try {
diff --git a/app/src/main/java/safeluck/drive/evaluation/app.java b/app/src/main/java/safeluck/drive/evaluation/app.java
index c57c2e7..99b4a3e 100644
--- a/app/src/main/java/safeluck/drive/evaluation/app.java
+++ b/app/src/main/java/safeluck/drive/evaluation/app.java
@@ -309,6 +309,7 @@
jkMessage0206.speed = speed;
jkMessage0206.fangXiang = (int)track_ture;
jkMessage0206.rf = qf;
+ utc =utc.substring(0,15);
jkMessage0206.timeBCD = utc;
jkMessage0206.json =json;
jkMessage0206.length = jkMessage0206.json.length();
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java
index e2d042b..ed62f16 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java
@@ -241,7 +241,8 @@
}
}
}
- for (int i = 0; i < map_other.length; i++) {
+ if (map_other.length>9){
+ for (int i = 0; i < map_other.length; i++) {
if (max_x < map_other[i][0]) {
max_x = map_other[i][0];
@@ -254,8 +255,10 @@
}
if (min_y > map_other[i][1]) {
min_y = map_other[i][1];
+ }
}
}
+
Log.d(TAG, "DrawMap max_x " + max_x + " max_y " + max_y + " min_x " + min_x + " min_y " + min_y);
@@ -571,7 +574,7 @@
}
}
}else{
- MyLog.i(TAG,"鏆傛椂杩樹笉鏀寔鏇茬嚎");
+ MyLog.i(TAG,"鏆傛椂鏀寔鏇茬嚎");
map_other = new double[xys.size()/2][2];
for (int k=0; k<xys.size();k++){
if ((k % 2) == 0) {
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 2da26bd..1003371 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
@@ -288,7 +288,7 @@
private int whatPaintColor(ExamStatus examStat) {
int map_id = examStat.getMap_id();
int status = examStat.getEnter();
- Log.i(TAG, "whatPaintColor: map_id="+map_id+" status="+status);
+ MyLog.i(TAG, "whatPaintColor: map_id="+map_id+" status="+status);
switch (status) {
case 0://鑰冭瘯瀹屾垚
switch (map_id) {
diff --git a/app/src/main/java/safeluck/drive/evaluation/im/IMSEventListener.java b/app/src/main/java/safeluck/drive/evaluation/im/IMSEventListener.java
index 4be28e9..d754273 100644
--- a/app/src/main/java/safeluck/drive/evaluation/im/IMSEventListener.java
+++ b/app/src/main/java/safeluck/drive/evaluation/im/IMSEventListener.java
@@ -37,7 +37,12 @@
public boolean isNetWorkAvailable() {
ConnectivityManager connectivityManager = (ConnectivityManager) app.getAppContext().getSystemService(Context.CONNECTIVITY_SERVICE);
NetworkInfo networkInfo = connectivityManager.getActiveNetworkInfo();
- MyLog.i("IsNetworkAvaliable"+networkInfo!=null&&networkInfo.isConnected());
+ if (networkInfo != null){
+
+ MyLog.i("IsNetworkAvaliable"+networkInfo!=null&&networkInfo.isConnected());
+ }else{
+ MyLog.i("NetWorkInfo is null");
+ }
return networkInfo!=null&&networkInfo.isConnected();
}
--
Gitblit v1.8.0