lizhanwei
2020-04-10 89752aee9911cdf0fd758474581859e11a45f296
修改8201消息(签到消息应答)
7个文件已修改
96 ■■■■■ 已修改文件
app/src/main/java/safeluck/drive/evaluation/DB/Student.java 23 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/DB/StudentInfoUpdateWork.java 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/MainActivity.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage8201.java 25 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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;
    }
}
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();
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
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;
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());
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());
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-学员*
**/