From 432b34202aed7b34d7c1719d4a056651b656ec62 Mon Sep 17 00:00:00 2001
From: yy1717 <fctom1215@outlook.com>
Date: 星期三, 26 二月 2020 13:26:03 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/endian11/DriveJudge
---
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 49 insertions(+), 8 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 eeb855a..a325f73 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
@@ -5,6 +5,7 @@
import android.os.Handler;
import android.os.Message;
+import android.text.TextUtils;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.MotionEvent;
@@ -37,6 +38,8 @@
import me.yokeyword.fragmentation.SupportFragment;
import safeluck.drive.evaluation.Constant;
+import safeluck.drive.evaluation.DB.Student;
+import safeluck.drive.evaluation.DB.WokViewModel;
import safeluck.drive.evaluation.DB.appstatusdb.AppStatus;
import safeluck.drive.evaluation.DB.appstatusdb.AppStatusViewModel;
import safeluck.drive.evaluation.DB.exam_status.ExamStatusInitWorker;
@@ -78,7 +81,7 @@
private int item_id;//鎵ｅ垎鍒嗘暟鎬诲拰
private ExamStatusViewModel examStatusViewModel;
private static final int ADD_DATA = 1;
- private TextView tv_speed,tv_total_score,tv_sat_num;
+ private TextView tv_speed,tv_total_score,tv_sat_num,tv_name,tv_id;
private double speed=0.0;
private ImageView iv_rtk_status,iv_head;
@@ -86,6 +89,7 @@
private List<ScoreBean> mArrayList = new ArrayList<>();
private static final int SPEED_DATA = 2;
private FailedProjViewModel failedProjViewModel;
+ String icson;//杩斿洖鐨刬c鍗′俊鎭� json
public static SupportFragment newInstance() {
return new NetWorkTrainFragment();
@@ -105,6 +109,23 @@
}
if (msg.what == SPEED_DATA){
tv_speed.setText(getResources().getString(R.string.speed,speed));
+ }
+ if (msg.what == Constant.IC_ID){
+ try {
+ JSONObject jsSpeed = new JSONObject(icson);
+ int result = jsSpeed.getInt("result");
+ String icStr = jsSpeed.getString("serialno");
+ if (result == 0) {
+ JKMessage0201 jkMessage0201 = new JKMessage0201();
+ jkMessage0201.currentExam = 1;
+ jkMessage0201.id = icStr;
+ MessageProcessor.getInstance().sendMessage(jkMessage0201);
+ }
+
+ }catch (JSONException e){
+
+ }
+
}
return false;
}
@@ -181,7 +202,21 @@
}
});
+ WokViewModel wokViewModel = ViewModelProviders.of(this).get(WokViewModel.class);
+ wokViewModel.getStudents().observe(this, new Observer<List<Student>>() {
+ @Override
+ public void onChanged(List<Student> students) {
+ for (Student student :
+ students) {
+ MyLog.i(TAG, "onChanged: " + student.toString());
+ if (!TextUtils.isEmpty(student.getName())){
+ tv_name.setText(getString(R.string.name)+student.getName());
+ tv_id.setText(getString(R.string.user_id)+student.getID());
+ }
+ }
+ }
+ });
AppStatusViewModel appStatusViewModel = ViewModelProviders.of(this).get(AppStatusViewModel.class);
appStatusViewModel.getAppStatus().observe(this, new Observer<AppStatus>() {
@@ -253,6 +288,8 @@
av_podao = view.findViewById(R.id.av1);
av_zhijiao = view.findViewById(R.id.av4);
houseView = view.findViewById(R.id.hv);
+ tv_name = view.findViewById(R.id.tv_name);
+ tv_id = view.findViewById(R.id.tv_ID);
iv_rtk_status = view.findViewById(R.id.iv_rtk_connect);
iv_head = view.findViewById(R.id.iv_head);
@@ -306,7 +343,7 @@
JKMessage0202 jkMessage0202 = new JKMessage0202();
jkMessage0202.phone = "0314200100000004";
jkMessage0202.timeBCD = new Date();
- jkMessage0202.curr_exam = 1;
+ jkMessage0202.curr_exam = 0;
jkMessage0202.ID = "123456789";
jkMessage0202.exam_id = 123456;
MessageProcessor.getInstance().sendMessage(jkMessage0202);
@@ -328,11 +365,9 @@
break;
case R.id.profile:
MyLog.i(TAG,"绛惧埌锛岃幏鍙栬韩浠借瘉鐗╃悊鍗″彿");
+ AYSdk.getInstance().sendCmd(Constant.READ_PHYSICAL_ID,null);
//TODO 鑾峰緱鐗╃悊鍗″彿 鍙戦�丣KMessage0201缁欏钩鍙帮紝鑾峰彇濮撳悕銆佽韩浠借瘉銆乭ead_url
- JKMessage0201 jkMessage0201 = new JKMessage0201();
- jkMessage0201.currentExam = 1;
- jkMessage0201.id = "123456789";
- MessageProcessor.getInstance().sendMessage(jkMessage0201);
+
break;
}
}
@@ -372,8 +407,14 @@
private ICEventListener icEventListener = new ICEventListener() {
@Override
public void onCEvent(String topic, int msgCode, int resultCode, Object obj) {
- speed = (double)obj;
- mHandler.obtainMessage(SPEED_DATA).sendToTarget();
+ if (msgCode == Constant.IC_ID){
+ icson = (String)obj;
+ mHandler.obtainMessage(msgCode).sendToTarget();
+ }else{
+ speed = (double)obj;
+ mHandler.obtainMessage(SPEED_DATA).sendToTarget();
+ }
+
}
};
@Override
--
Gitblit v1.8.0