lizhanwei
2020-03-08 7915395e0199f64fb108f70df18a8df0c08876fb
修改NetWorkinfo 可能为null的bug
6个文件已修改
24 ■■■■■ 已修改文件
app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusViewModel.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusWoker.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/app.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/im/IMSEventListener.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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 +
                '}';
    }
}
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 {
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();
app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java
@@ -241,6 +241,7 @@
                        }
                    }
                }
                if (map_other.length>9){
 for (int i = 0; i < map_other.length; i++) {
                        if (max_x < map_other[i][0]) {
@@ -256,6 +257,8 @@
                            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) {
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) {
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();
        if (networkInfo != null){
        MyLog.i("IsNetworkAvaliable"+networkInfo!=null&&networkInfo.isConnected());
        }else{
            MyLog.i("NetWorkInfo is null");
        }
        return networkInfo!=null&&networkInfo.isConnected();
    }