From 8735b56eefde751618c819f5b331a56a62274a5c Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期四, 14 五月 2020 18:30:22 +0800
Subject: [PATCH] Merge branch 'newUI'
---
app/src/main/java/safeluck/drive/evaluation/app.java | 33 +++++++++++++++++++++++----------
1 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/app.java b/app/src/main/java/safeluck/drive/evaluation/app.java
index 6867cfd..6761109 100644
--- a/app/src/main/java/safeluck/drive/evaluation/app.java
+++ b/app/src/main/java/safeluck/drive/evaluation/app.java
@@ -47,6 +47,7 @@
import safeluck.drive.evaluation.cEventCenter.CEventCenter;
import safeluck.drive.evaluation.im.MessageProcessor;
import safeluck.drive.evaluation.platformMessage.AttachInfo;
+import safeluck.drive.evaluation.platformMessage.AttachInfo2;
import safeluck.drive.evaluation.platformMessage.JKMessage0203;
import safeluck.drive.evaluation.platformMessage.JKMessage0206;
import safeluck.drive.evaluation.platformMessage.PlatFormConstant;
@@ -93,12 +94,20 @@
//鏁版嵁搴撴搷浣�
MyLog.i(TAG, "onCreate111");
FileUtil.createdirs(getApplicationContext());
- //1.鍏堟鏌d鍗″寘鍚嶇殑鐩綍涓嬶紝鏄惁瀛樺湪鍦板浘鏂囦欢鍜岃溅杈嗘ā鍨嬫枃浠�
- //2. 濡傛灉涓嶈兘鍐嶅氨鍘讳笅杞�
+
+ //鑰冭瘯鐘舵�� 锛屼竴浜涘垵濮嬬姸鎬侊紝app涓�浜涚姸鎬佸簲璇ュ厛鍒濆鍖栦竴涓�
+ initData();
}
+ }
+
+ private void initData() {
+ CThreadPoolExecutor.runInBackground(()->{
+ int type = WorkRoomDataBase.getWorkRoomDataBase(getApplicationContext()).getExamStatusDao().getStartExamInt();
+ ExamPlatformData.getInstance().setExamType(type);
+ });
}
public static Context getAppContext(){
@@ -400,17 +409,21 @@
jkMessage0206.json =json;
jkMessage0206.length = jkMessage0206.json.length();
AttachInfo attachInfo = new AttachInfo();
- attachInfo.attach_message_id = Integer.parseInt(String.valueOf(0x40));
- attachInfo.attach_message_length = 4;
- if (attachInfo.attach_message_id == 0x41){
- attachInfo.attach_data="00000000";
- }else{
+ AttachInfo2 attachInfo2 = new AttachInfo2();
+ attachInfo.attach_message_id = 0x41;
- //18涓瓧鑺� ascii
- attachInfo.attach_data="303030303030303030303030303030303030";
- }
jkMessage0206.attachInfo = attachInfo;
+
+
+ attachInfo2.attach_message_id = 0x42;
+ if (ExamPlatformData.getInstance().getExamType()>ExamPlatformData.EXAM_TYPE_ChangKAO){
+ attachInfo2.attach_data =1;
+ }else{
+
+ attachInfo2.attach_data = 0;
+ }
+ jkMessage0206.attachInfo2 = attachInfo2;
if (ExamPlatformData.getInstance().getTrainingMode()==ExamPlatformData.MODE_NONE){
//鍒ゆ柇10s鏃堕棿鏄惁鍒�
if (ExamPlatformData.getInstance().isTimeArrive_10s()){
--
Gitblit v1.8.0