From 5771636bf3c5bc5d0557467b09547e4f565ddb5d Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期五, 08 五月 2020 17:36:16 +0800
Subject: [PATCH] 调试平台协议
---
app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java | 14 +++++++
app/src/main/java/safeluck/drive/evaluation/util/SPUtils.java | 1
app/src/main/res/layout/layout_net_train.xml | 2
lib/src/main/cpp/native-lib.cpp | 2
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java | 28 ++++++++++---
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java | 33 ++++++++++++----
6 files changed, 62 insertions(+), 18 deletions(-)
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 4a842ff..0c64c66 100644
--- a/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java
+++ b/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;
+ }
}
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 e4ff378..7477d75 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
+++ b/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;
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 89ef3e9..8ac2f3d 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
+++ b/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;
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/util/SPUtils.java b/app/src/main/java/safeluck/drive/evaluation/util/SPUtils.java
index 102995c..3ecc2c3 100644
--- a/app/src/main/java/safeluck/drive/evaluation/util/SPUtils.java
+++ b/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";
/**
* 淇濆瓨鏁版嵁鐨勬柟娉曪紝鎴戜滑闇�瑕佹嬁鍒颁繚瀛樻暟鎹殑鍏蜂綋绫诲瀷锛岀劧鍚庢牴鎹被鍨嬭皟鐢ㄤ笉鍚岀殑淇濆瓨鏂规硶
diff --git a/app/src/main/res/layout/layout_net_train.xml b/app/src/main/res/layout/layout_net_train.xml
index 1ea7818..cc15c51 100644
--- a/app/src/main/res/layout/layout_net_train.xml
+++ b/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"
diff --git a/lib/src/main/cpp/native-lib.cpp b/lib/src/main/cpp/native-lib.cpp
index 52dd222..21a13ad 100644
--- a/lib/src/main/cpp/native-lib.cpp
+++ b/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;
--
Gitblit v1.8.0