~yy/smart_train.git

parent: bd84b7e5 | 补丁 | 提交 | ignore whitespace

lizhanwei

2020-05-08 5771636bf3c5bc5d0557467b09547e4f565ddb5d

调试平台协议

6个文件已修改

	app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java	33 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java	28 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/safeluck/drive/evaluation/util/SPUtils.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/res/layout/layout_net_train.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	lib/src/main/cpp/native-lib.cpp	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java

@@ -416,6 +416,8 @@
        return isStuSign;
    }
    public void setStuSign(boolean flag){
        if (!flag)
        setSingnMode(SIGN_MODE_NONE);
        isStuSign = flag;
        SPUtils.put(app.getAppContext(),SPUtils.STU_SIGN_STATUS,flag);
    }
@@ -432,4 +434,16 @@
        SPUtils.put(app.getAppContext(),SPUtils.Coach_SIGN_STATUS,flag);
    }
    private boolean isCoachSign;
    private int sign_mode = 0;
    public static final int SIGN_MODE_NONE =0 ;
    public static final int SIGN_MODE_TRAIN =1 ;
    public static final int SIGN_MODE_EXAM =2 ;
    public void setSingnMode(int mode){
        SPUtils.put(app.getAppContext(),SPUtils.SIGN_MODE,mode);
        this.sign_mode = mode;
    }
    public int getSign_mode(){
        sign_mode = (int) SPUtils.get(app.getAppContext(),SPUtils.SIGN_MODE,0);
        return sign_mode;
    }
}

 app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java

@@ -22,6 +22,7 @@
import android.widget.ImageView;
import android.widget.ListView;
import android.widget.TextView;
import android.widget.Toast;


import androidx.annotation.NonNull;
@@ -477,16 +478,19 @@
                for (Student student :
                        students) {
                    MyLog.i(TAG, "onChanged: " + student.toString());
                    if (!TextUtils.isEmpty(student.getName())&&student.getStu_id()==ExamPlatformData.STU_ID){
                        tv_name.setText(getNameColor(student.getName()));
                        Picasso.with(_mActivity).load(student.getHead_url()).into(iv_head);
                        ExamPlatformData.getInstance().setId(student.getID());
                        tv_start_time.setText(getString(R.string.begin_time)+Utils.formatTimeYYMMDDHHmmSS(student.getBegin_time()));
                    }else if (!TextUtils.isEmpty(student.getName())&&student.getStu_id()==ExamPlatformData.COACH_ID){
                        ExamPlatformData.getInstance().setCoachID(student.getID());
                        tv_coach_name.setText(getNameColor(student.getName()));
                        Picasso.with(_mActivity).load(student.getHead_url()).into(iv_coach_head);
                    if (ExamPlatformData.getInstance().getSign_mode()==ExamPlatformData.SIGN_MODE_EXAM){
                        if (!TextUtils.isEmpty(student.getName())&&student.getStu_id()==ExamPlatformData.STU_ID){
                            tv_name.setText(getNameColor(student.getName()));
                            Picasso.with(_mActivity).load(student.getHead_url()).into(iv_head);
                            ExamPlatformData.getInstance().setId(student.getID());
                            tv_start_time.setText(getString(R.string.begin_time)+Utils.formatTimeYYMMDDHHmmSS(student.getBegin_time()));
                        }else if (!TextUtils.isEmpty(student.getName())&&student.getStu_id()==ExamPlatformData.COACH_ID){
                            ExamPlatformData.getInstance().setCoachID(student.getID());
                            tv_coach_name.setText(getNameColor(student.getName()));
                            Picasso.with(_mActivity).load(student.getHead_url()).into(iv_coach_head);
                        }
                    }

                }
            }
        });
@@ -627,23 +631,34 @@

            case R.id.iv_head:
                MyLog.i(TAG,"学员签到");
                if (ExamPlatformData.getInstance().getSign_mode() == ExamPlatformData.SIGN_MODE_TRAIN){
                    Toast.makeText(_mActivity, "您已经在\"单机训练\"页面下签到", Toast.LENGTH_SHORT).show();
                    return;
                }
                if (ExamPlatformData.getInstance().IsStuSign()){

                    ExamPlatformData.getInstance().setStuSign(false);
                    qrcode(1,false);

                }else{
                    ExamPlatformData.getInstance().setStuSign(true);
                    qrcode(1,true);
                    ExamPlatformData.getInstance().setSingnMode(ExamPlatformData.SIGN_MODE_EXAM);
                }
                break;
            case R.id.iv_coach_head:
                MyLog.i(PlatFormConstant.HTTPTAG,"教练签到");
                if (ExamPlatformData.getInstance().getSign_mode() == ExamPlatformData.SIGN_MODE_TRAIN){
                    Toast.makeText(_mActivity, "您已经在\"单机训练\"页面下签到", Toast.LENGTH_SHORT).show();
                    return;
                }
                if (ExamPlatformData.getInstance().IsCoachSign()){
                    ExamPlatformData.getInstance().setCoachSign(false);
                    qrcode(0,false);
                }else{
                    ExamPlatformData.getInstance().setCoachSign(true);
                    qrcode(0,true);
                    ExamPlatformData.getInstance().setSingnMode(ExamPlatformData.SIGN_MODE_EXAM);
                }

                break;

 app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java

@@ -67,6 +67,7 @@
import safeluck.drive.evaluation.cEventCenter.CEventCenter;
import safeluck.drive.evaluation.cEventCenter.ICEventListener;
import safeluck.drive.evaluation.customview.LoadProgressDialog;
import safeluck.drive.evaluation.customview.MyDialog;
import safeluck.drive.evaluation.customview.QRCodeDialog;
import safeluck.drive.evaluation.customview.SelectDialog;
import safeluck.drive.evaluation.im.MessageProcessor;
@@ -470,16 +471,19 @@
                for (Student student :
                        students) {
                    MyLog.i(TAG, "onChanged: " + student.toString());
                    if (!TextUtils.isEmpty(student.getName())&&student.getStu_id()==ExamPlatformData.STU_ID){
                    if (ExamPlatformData.getInstance().getSign_mode()==ExamPlatformData.SIGN_MODE_TRAIN){
                        if (!TextUtils.isEmpty(student.getName())&&student.getStu_id()==ExamPlatformData.STU_ID){

                        tv_name.setText(getNameColor(student.getName()));
                        ExamPlatformData.getInstance().setId(student.getID());
                        tv_start_time.setText(getString(R.string.begin_time)+Utils.formatTimeYYMMDDHHmmSS(student.getBegin_time()));
                            tv_name.setText(getNameColor(student.getName()));
                            ExamPlatformData.getInstance().setId(student.getID());
                            tv_start_time.setText(getString(R.string.begin_time)+Utils.formatTimeYYMMDDHHmmSS(student.getBegin_time()));

                    }else if (!TextUtils.isEmpty(student.getName())&&student.getStu_id()==ExamPlatformData.COACH_ID){
                        ExamPlatformData.getInstance().setCoachID(student.getID());
                        tv_coach_name.setText(getNameColor(student.getName()));
                        }else if (!TextUtils.isEmpty(student.getName())&&student.getStu_id()==ExamPlatformData.COACH_ID){
                            ExamPlatformData.getInstance().setCoachID(student.getID());
                            tv_coach_name.setText(getNameColor(student.getName()));
                        }
                    }

                }
            }
        });
@@ -609,23 +613,33 @@
                break;
            case R.id.iv_head:
                MyLog.i(TAG,"学员签到");
                if (ExamPlatformData.getInstance().getSign_mode() == ExamPlatformData.SIGN_MODE_EXAM){
                    Toast.makeText(_mActivity, "您已经在\"联网考试\"页面下签到", Toast.LENGTH_SHORT).show();
                    return;
                }
                if (ExamPlatformData.getInstance().IsStuSign()){
                    ExamPlatformData.getInstance().setStuSign(false);
                    qrcode(1,false);
                }else{
                    ExamPlatformData.getInstance().setStuSign(true);
                    qrcode(1,true);
                    ExamPlatformData.getInstance().setSingnMode(ExamPlatformData.SIGN_MODE_TRAIN);
                }

                break;
            case R.id.iv_coach_head:
                MyLog.i(PlatFormConstant.HTTPTAG,"教练签到");
                if (ExamPlatformData.getInstance().getSign_mode() == ExamPlatformData.SIGN_MODE_EXAM){
                    Toast.makeText(_mActivity, "您已经在\"联网考试\"页面下签到", Toast.LENGTH_SHORT).show();
                    return;
                }
                if (ExamPlatformData.getInstance().IsCoachSign()){
                    ExamPlatformData.getInstance().setCoachSign(false);
                    qrcode(0,false);
                }else{
                    ExamPlatformData.getInstance().setCoachSign(true);
                    qrcode(0,true);
                    ExamPlatformData.getInstance().setSingnMode(ExamPlatformData.SIGN_MODE_TRAIN);
                }
                break;
        }

 app/src/main/java/safeluck/drive/evaluation/util/SPUtils.java

@@ -25,6 +25,7 @@
    public static final String ROAD_MAP_PATH = "road_map_path";
    public static final String STU_SIGN_STATUS = "stu_sign_";
    public static final String Coach_SIGN_STATUS = "coach_sign_";
    public static final String SIGN_MODE = "sign_mode";

    /**
     * 保存数据的方法，我们需要拿到保存数据的具体类型，然后根据类型调用不同的保存方法

 app/src/main/res/layout/layout_net_train.xml

@@ -32,7 +32,7 @@
            android:layout_height="wrap_content"
            android:layout_toRightOf="@+id/tv_item"
            android:gravity="center"
            android:layout_marginLeft="378dp"
            android:layout_marginLeft="300dp"
            android:padding="10dp"
            android:id="@+id/tv_speed"
            android:textColor="#A1A1A3"

 lib/src/main/cpp/native-lib.cpp

@@ -26,7 +26,7 @@
const int RTK_PLATFORM_PORT = 12125;
const uint8_t phone[] = {0x20,0x19,0x10,0x15,0x00,0x00,0x00,0x01};

const char *VIRTUAL_RTK_IP = "192.168.16.106";
const char *VIRTUAL_RTK_IP = "192.168.16.112";
const int VIRTUAL_RTK_PORT = 9001;

static pthread_mutex_t tts_mutex = PTHREAD_MUTEX_INITIALIZER;

			@@ -416,6 +416,8 @@
			return isStuSign;
			}
			public void setStuSign(boolean flag){
			if (!flag)
			setSingnMode(SIGN_MODE_NONE);
			isStuSign = flag;
			SPUtils.put(app.getAppContext(),SPUtils.STU_SIGN_STATUS,flag);
			}
			@@ -432,4 +434,16 @@
			SPUtils.put(app.getAppContext(),SPUtils.Coach_SIGN_STATUS,flag);
			}
			private boolean isCoachSign;
			private int sign_mode = 0;
			public static final int SIGN_MODE_NONE =0 ;
			public static final int SIGN_MODE_TRAIN =1 ;
			public static final int SIGN_MODE_EXAM =2 ;
			public void setSingnMode(int mode){
			SPUtils.put(app.getAppContext(),SPUtils.SIGN_MODE,mode);
			this.sign_mode = mode;
			}
			public int getSign_mode(){
			sign_mode = (int) SPUtils.get(app.getAppContext(),SPUtils.SIGN_MODE,0);
			return sign_mode;
			}
			}

			@@ -22,6 +22,7 @@
			import android.widget.ImageView;
			import android.widget.ListView;
			import android.widget.TextView;
			import android.widget.Toast;


			import androidx.annotation.NonNull;
			@@ -477,16 +478,19 @@
			for (Student student :
			students) {
			MyLog.i(TAG, "onChanged: " + student.toString());
			if (!TextUtils.isEmpty(student.getName())&&student.getStu_id()==ExamPlatformData.STU_ID){
			tv_name.setText(getNameColor(student.getName()));
			Picasso.with(_mActivity).load(student.getHead_url()).into(iv_head);
			ExamPlatformData.getInstance().setId(student.getID());
			tv_start_time.setText(getString(R.string.begin_time)+Utils.formatTimeYYMMDDHHmmSS(student.getBegin_time()));
			}else if (!TextUtils.isEmpty(student.getName())&&student.getStu_id()==ExamPlatformData.COACH_ID){
			ExamPlatformData.getInstance().setCoachID(student.getID());
			tv_coach_name.setText(getNameColor(student.getName()));
			Picasso.with(_mActivity).load(student.getHead_url()).into(iv_coach_head);
			if (ExamPlatformData.getInstance().getSign_mode()==ExamPlatformData.SIGN_MODE_EXAM){
			if (!TextUtils.isEmpty(student.getName())&&student.getStu_id()==ExamPlatformData.STU_ID){
			tv_name.setText(getNameColor(student.getName()));
			Picasso.with(_mActivity).load(student.getHead_url()).into(iv_head);
			ExamPlatformData.getInstance().setId(student.getID());
			tv_start_time.setText(getString(R.string.begin_time)+Utils.formatTimeYYMMDDHHmmSS(student.getBegin_time()));
			}else if (!TextUtils.isEmpty(student.getName())&&student.getStu_id()==ExamPlatformData.COACH_ID){
			ExamPlatformData.getInstance().setCoachID(student.getID());
			tv_coach_name.setText(getNameColor(student.getName()));
			Picasso.with(_mActivity).load(student.getHead_url()).into(iv_coach_head);
			}
			}

			}
			}
			});
			@@ -627,23 +631,34 @@

			case R.id.iv_head:
			MyLog.i(TAG,"学员签到");
			if (ExamPlatformData.getInstance().getSign_mode() == ExamPlatformData.SIGN_MODE_TRAIN){
			Toast.makeText(_mActivity, "您已经在\"单机训练\"页面下签到", Toast.LENGTH_SHORT).show();
			return;
			}
			if (ExamPlatformData.getInstance().IsStuSign()){

			ExamPlatformData.getInstance().setStuSign(false);
			qrcode(1,false);

			}else{
			ExamPlatformData.getInstance().setStuSign(true);
			qrcode(1,true);
			ExamPlatformData.getInstance().setSingnMode(ExamPlatformData.SIGN_MODE_EXAM);
			}
			break;
			case R.id.iv_coach_head:
			MyLog.i(PlatFormConstant.HTTPTAG,"教练签到");
			if (ExamPlatformData.getInstance().getSign_mode() == ExamPlatformData.SIGN_MODE_TRAIN){
			Toast.makeText(_mActivity, "您已经在\"单机训练\"页面下签到", Toast.LENGTH_SHORT).show();
			return;
			}
			if (ExamPlatformData.getInstance().IsCoachSign()){
			ExamPlatformData.getInstance().setCoachSign(false);
			qrcode(0,false);
			}else{
			ExamPlatformData.getInstance().setCoachSign(true);
			qrcode(0,true);
			ExamPlatformData.getInstance().setSingnMode(ExamPlatformData.SIGN_MODE_EXAM);
			}

			break;

			@@ -67,6 +67,7 @@
			import safeluck.drive.evaluation.cEventCenter.CEventCenter;
			import safeluck.drive.evaluation.cEventCenter.ICEventListener;
			import safeluck.drive.evaluation.customview.LoadProgressDialog;
			import safeluck.drive.evaluation.customview.MyDialog;
			import safeluck.drive.evaluation.customview.QRCodeDialog;
			import safeluck.drive.evaluation.customview.SelectDialog;
			import safeluck.drive.evaluation.im.MessageProcessor;
			@@ -470,16 +471,19 @@
			for (Student student :
			students) {
			MyLog.i(TAG, "onChanged: " + student.toString());
			if (!TextUtils.isEmpty(student.getName())&&student.getStu_id()==ExamPlatformData.STU_ID){
			if (ExamPlatformData.getInstance().getSign_mode()==ExamPlatformData.SIGN_MODE_TRAIN){
			if (!TextUtils.isEmpty(student.getName())&&student.getStu_id()==ExamPlatformData.STU_ID){

			tv_name.setText(getNameColor(student.getName()));
			ExamPlatformData.getInstance().setId(student.getID());
			tv_start_time.setText(getString(R.string.begin_time)+Utils.formatTimeYYMMDDHHmmSS(student.getBegin_time()));
			tv_name.setText(getNameColor(student.getName()));
			ExamPlatformData.getInstance().setId(student.getID());
			tv_start_time.setText(getString(R.string.begin_time)+Utils.formatTimeYYMMDDHHmmSS(student.getBegin_time()));

			}else if (!TextUtils.isEmpty(student.getName())&&student.getStu_id()==ExamPlatformData.COACH_ID){
			ExamPlatformData.getInstance().setCoachID(student.getID());
			tv_coach_name.setText(getNameColor(student.getName()));
			}else if (!TextUtils.isEmpty(student.getName())&&student.getStu_id()==ExamPlatformData.COACH_ID){
			ExamPlatformData.getInstance().setCoachID(student.getID());
			tv_coach_name.setText(getNameColor(student.getName()));
			}
			}

			}
			}
			});
			@@ -609,23 +613,33 @@
			break;
			case R.id.iv_head:
			MyLog.i(TAG,"学员签到");
			if (ExamPlatformData.getInstance().getSign_mode() == ExamPlatformData.SIGN_MODE_EXAM){
			Toast.makeText(_mActivity, "您已经在\"联网考试\"页面下签到", Toast.LENGTH_SHORT).show();
			return;
			}
			if (ExamPlatformData.getInstance().IsStuSign()){
			ExamPlatformData.getInstance().setStuSign(false);
			qrcode(1,false);
			}else{
			ExamPlatformData.getInstance().setStuSign(true);
			qrcode(1,true);
			ExamPlatformData.getInstance().setSingnMode(ExamPlatformData.SIGN_MODE_TRAIN);
			}

			break;
			case R.id.iv_coach_head:
			MyLog.i(PlatFormConstant.HTTPTAG,"教练签到");
			if (ExamPlatformData.getInstance().getSign_mode() == ExamPlatformData.SIGN_MODE_EXAM){
			Toast.makeText(_mActivity, "您已经在\"联网考试\"页面下签到", Toast.LENGTH_SHORT).show();
			return;
			}
			if (ExamPlatformData.getInstance().IsCoachSign()){
			ExamPlatformData.getInstance().setCoachSign(false);
			qrcode(0,false);
			}else{
			ExamPlatformData.getInstance().setCoachSign(true);
			qrcode(0,true);
			ExamPlatformData.getInstance().setSingnMode(ExamPlatformData.SIGN_MODE_TRAIN);
			}
			break;
			}

			@@ -25,6 +25,7 @@
			public static final String ROAD_MAP_PATH = "road_map_path";
			public static final String STU_SIGN_STATUS = "stu_sign_";
			public static final String Coach_SIGN_STATUS = "coach_sign_";
			public static final String SIGN_MODE = "sign_mode";

			/**
			* 保存数据的方法，我们需要拿到保存数据的具体类型，然后根据类型调用不同的保存方法

			@@ -32,7 +32,7 @@
			android:layout_height="wrap_content"
			android:layout_toRightOf="@+id/tv_item"
			android:gravity="center"
			android:layout_marginLeft="378dp"
			android:layout_marginLeft="300dp"
			android:padding="10dp"
			android:id="@+id/tv_speed"
			android:textColor="#A1A1A3"

			@@ -26,7 +26,7 @@
			const int RTK_PLATFORM_PORT = 12125;
			const uint8_t phone[] = {0x20,0x19,0x10,0x15,0x00,0x00,0x00,0x01};

			const char *VIRTUAL_RTK_IP = "192.168.16.106";
			const char *VIRTUAL_RTK_IP = "192.168.16.112";
			const int VIRTUAL_RTK_PORT = 9001;

			static pthread_mutex_t tts_mutex = PTHREAD_MUTEX_INITIALIZER;