From 89752aee9911cdf0fd758474581859e11a45f296 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期五, 10 四月 2020 15:46:22 +0800
Subject: [PATCH] 修改8201消息(签到消息应答)
---
app/src/main/java/safeluck/drive/evaluation/DB/StudentInfoUpdateWork.java | 20 ++++++++-
app/src/main/java/safeluck/drive/evaluation/MainActivity.java | 17 --------
app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java | 7 +++
app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage8201.java | 25 +++++++++++-
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java | 2
app/src/main/java/safeluck/drive/evaluation/DB/Student.java | 23 ++++++++---
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java | 2
7 files changed, 65 insertions(+), 31 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/DB/Student.java b/app/src/main/java/safeluck/drive/evaluation/DB/Student.java
index 5dd1ec2..256bfb2 100644
--- a/app/src/main/java/safeluck/drive/evaluation/DB/Student.java
+++ b/app/src/main/java/safeluck/drive/evaluation/DB/Student.java
@@ -33,6 +33,9 @@
@ColumnInfo(name = "head_url")
private String head_url;
+ @ColumnInfo(name ="person_type")
+ private int personType = 1;
+
public String getHead_url() {
return head_url;
}
@@ -51,12 +54,12 @@
@ColumnInfo(name = "begin_time")
private long begin_time;
- public Student(long stu_id, @NonNull String name, String ID, int sex) {
- this.stu_id = stu_id;
- this.name = name;
- this.ID = ID;
- this.sex = sex;
- }
+// public Student(long stu_id, @NonNull String name, String ID, int sex) {
+// this.stu_id = stu_id;
+// this.name = name;
+// this.ID = ID;
+// this.sex = sex;
+// }
public long getStu_id() {
@@ -103,4 +106,12 @@
", begin_time=" + begin_time +
'}';
}
+
+ public void setPersonType(int personType) {
+ this.personType = personType;
+ }
+
+ public int getPersonType() {
+ return personType;
+ }
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/DB/StudentInfoUpdateWork.java b/app/src/main/java/safeluck/drive/evaluation/DB/StudentInfoUpdateWork.java
index 88ff389..1b1f0bc 100644
--- a/app/src/main/java/safeluck/drive/evaluation/DB/StudentInfoUpdateWork.java
+++ b/app/src/main/java/safeluck/drive/evaluation/DB/StudentInfoUpdateWork.java
@@ -32,7 +32,7 @@
try {
jsonObject = new JSONObject(str);
- String headUrl = jsonObject.getString("head_url");
+ int personType = jsonObject.getInt("personType");
String id = jsonObject.getString("ID");
String name = jsonObject.getString("name");
int sex = 2;//榛樿鏄コ鐢�
@@ -46,8 +46,22 @@
sex = 1;
}
}
- Student student =new Student(1001,name,id,sex);
- student.setHead_url(headUrl);
+ Student student = new Student();
+ switch (personType){
+ case 0:
+ //鏁欑粌
+ student.setStu_id(1002);
+ break;
+ case 1:
+ //瀛﹀憳
+ student.setStu_id(1001);
+
+ break;
+ default:break;
+ }
+ student.setName(name);
+ student.setSex(sex);
+ student.setPersonType(personType);
MyLog.i("鏇存柊绛惧埌浜哄憳淇℃伅锛�"+student.toString());
WorkRoomDataBase.getWorkRoomDataBase(getApplicationContext()).getstudentDao().insert(student);
return Result.success();
diff --git a/app/src/main/java/safeluck/drive/evaluation/MainActivity.java b/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
index bb630a5..7df7eb4 100644
--- a/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
+++ b/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
@@ -169,23 +169,6 @@
});
-// signalConfigViewModel = ViewModelProviders.of(this).get(SignalConfigViewModel.class);
-// signalConfigViewModel.getSignalConfigs().observe(this, new Observer<List<SingalConfig>>() {
-// @Override
-// public void onChanged(List<SingalConfig> singalConfigs) {
-// signalConfiglist.clear();
-// MyLog.i(TAG, "淇″彿閰嶇疆鍙戠敓鍙樺寲");
-//
-// for (int i = 0; i < singalConfigs.size(); i++) {
-// SignalConfigRemote signalConfigRemote = new SignalConfigRemote();
-// signalConfigRemote.setFunc_id(i);
-// signalConfigRemote.setGpio_num(singalConfigs.get(i).getIndex());
-// signalConfigRemote.setLevel(singalConfigs.get(i).getHighLevel());
-// signalConfiglist.add(signalConfigRemote);
-// }
-// sendSignalConfigsToRemote();
-// }
-// });
mPermissionsManager = new PermissionManager(this) {
@Override
diff --git a/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java b/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java
index 892e469..b586d21 100644
--- a/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java
+++ b/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java
@@ -28,6 +28,13 @@
public class ExamPlatformData {
+
+
+ public static final int PERSON_TYPE_COACH = 0;//绫诲瀷涓烘暀缁�
+ public static final int PERSON_TYPE_STU = 1;//浜哄憳绫诲瀷涓哄鍛�
+ public static final int COACH_ID = 1002;//鏁欑粌鏁版嵁搴撹〃閲岄潰鐨勫敮涓�id
+ public static final int STU_ID = 1001;//瀛﹀憳鏁版嵁搴撹〃閲岄潰鐨勫敮涓�id
+
public static final int MODE_NONE = 0;
public static final int EXAM_TYPE_LUKAO_Light = 3;
public static final int EXAM_TYPE_LUKAO = 4;
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 6767d3d..52acb1b 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
@@ -477,7 +477,7 @@
for (Student student :
students) {
MyLog.i(TAG, "onChanged: " + student.toString());
- if (!TextUtils.isEmpty(student.getName())){
+ if (!TextUtils.isEmpty(student.getName())&&student.getStu_id()==ExamPlatformData.STU_ID){
tv_name.setText(getString(R.string.name)+student.getName());
tv_id.setText(getString(R.string.user_id)+student.getID());
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 e0bfa59..baebf8b 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
@@ -466,7 +466,7 @@
for (Student student :
students) {
MyLog.i(TAG, "onChanged: " + student.toString());
- if (!TextUtils.isEmpty(student.getName())){
+ if (!TextUtils.isEmpty(student.getName())&&student.getStu_id()==ExamPlatformData.STU_ID){
tv_name.setText(getString(R.string.name)+student.getName());
tv_id.setText(getString(R.string.user_id)+student.getID());
diff --git a/app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage8201.java b/app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage8201.java
index b75bdc3..7afcf60 100644
--- a/app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage8201.java
+++ b/app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage8201.java
@@ -17,7 +17,26 @@
@Order(4)
- @Length(0)
- @Ascii
- public String head_url;
+ @Int8
+ public int personType;
}
+/**
+ 0
+ 鐧诲綍缁撴灉
+ BYTE
+ 1锛氱櫥褰曟垚鍔燂紱 2锛氭棤鏁堢殑韬唤璇佸彿锛� 3锛氱姝㈢櫥褰曠殑瀛﹀憳锛�
+ 4锛氬尯鍩熷鏁欏鎻愰啋锛� 5锛氬噯椹捐溅鍨嬩笌鑰冭瘯杞﹀瀷涓嶇锛�
+ 9锛氬叾浠栭敊璇�
+ 1
+ 韬唤璇佸彿鐮�
+ BYTE[18]
+ ASC瀛楃锛岃韩浠借瘉鍙风爜
+ 19
+ 濮撳悕
+ BYTE[20]
+ ASC瀛楃锛屼笉瓒宠ˉ0
+ 39
+ 浜哄憳绫诲瀷
+ BYTE
+ 0-鏁欑粌锛�1-瀛﹀憳*
+**/
\ No newline at end of file
--
Gitblit v1.8.0