From 2f7e9461424d815b3aaabe27a17eade8198b2bf4 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期五, 10 四月 2020 15:17:22 +0800
Subject: [PATCH] 修改0202（开始考试） 0203（评判消息） 0204（结束考试 平台协议（去掉身份证字段）
---
app/src/main/java/safeluck/drive/evaluation/app.java | 24 ----
/dev/null | 179 -----------------------------------
app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0204.java | 10 -
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java | 7
app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0203.java | 18 +--
app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0202.java | 44 +++++---
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java | 5
app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java | 4
8 files changed, 42 insertions(+), 249 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/app.java b/app/src/main/java/safeluck/drive/evaluation/app.java
index f3ace57..dedd39a 100644
--- a/app/src/main/java/safeluck/drive/evaluation/app.java
+++ b/app/src/main/java/safeluck/drive/evaluation/app.java
@@ -35,53 +35,32 @@
import org.json.JSONException;
import org.json.JSONObject;
-import java.io.File;
-import java.io.IOException;
import java.util.Date;
import java.util.Random;
-import okhttp3.ResponseBody;
-import retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.Response;
import safeluck.drive.evaluation.DB.WorkRoomDataBase;
import safeluck.drive.evaluation.DB.appstatusdb.AppStatusWorker;
import safeluck.drive.evaluation.DB.criterias.CriteriaForI;
import safeluck.drive.evaluation.DB.criterias.CriteriaForIII;
-import safeluck.drive.evaluation.DB.exam_status.ExamStatusInitWorker;
import safeluck.drive.evaluation.DB.exam_status.ExamStatusOutWorker;
import safeluck.drive.evaluation.DB.exam_status.ExamStatusWoker;
import safeluck.drive.evaluation.DB.failitems.FailedProj;
-import safeluck.drive.evaluation.DB.failitems.FailedProjRepository;
-import safeluck.drive.evaluation.DB.failitems.FailedProj_select;
import safeluck.drive.evaluation.DB.failitems.LuKaoFailedProj;
import safeluck.drive.evaluation.DB.gps.GpsInfoWorker;
import safeluck.drive.evaluation.DB.rtktb.RTKConfig;
import safeluck.drive.evaluation.DB.rtktb.RTKConfigUpdateWorker;
-import safeluck.drive.evaluation.DB.rtktb.RTKWorkRepository;
-import safeluck.drive.evaluation.bean.ExamMap;
import safeluck.drive.evaluation.bean.ExamPlatformData;
-import safeluck.drive.evaluation.cEventCenter.CEvent;
import safeluck.drive.evaluation.cEventCenter.CEventCenter;
-import safeluck.drive.evaluation.httpmodule.HttpRequetBean;
-import safeluck.drive.evaluation.httpmodule.RetrofitCreator;
-import safeluck.drive.evaluation.im.IMSClientBootstrap;
-import safeluck.drive.evaluation.im.IMSConnectStatusListener;
import safeluck.drive.evaluation.im.MessageProcessor;
import safeluck.drive.evaluation.platformMessage.AttachInfo;
-import safeluck.drive.evaluation.platformMessage.JKMessage0100;
-import safeluck.drive.evaluation.platformMessage.JKMessage0101;
import safeluck.drive.evaluation.platformMessage.JKMessage0203;
import safeluck.drive.evaluation.platformMessage.JKMessage0206;
import safeluck.drive.evaluation.platformMessage.PlatFormConstant;
import safeluck.drive.evaluation.util.CThreadPoolExecutor;
import safeluck.drive.evaluation.util.FileUtil;
-import safeluck.drive.evaluation.util.SPUtils;
import safeluck.drive.evaluation.util.SystemUtil;
import safeluck.drive.evaluation.util.Utils;
-import safeluck.drive.evaluation.viewmodels.TimeViewModel;
import safeluck.drive.evaluation.worker.MCUUpgradeWorker;
-import safeluck.drive.evaluation.worker.TTSWorker;
/**
* MyApplication2
@@ -92,9 +71,6 @@
public class app extends Application implements IAYExamListener {
private static final String TAG = "app";
- private Gson gson;
- RTKConfig rtkConfig;
- Random random = new Random();
private static Context appContext=null;
@Override
public void onCreate() {
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 e6ba3e4..6767d3d 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
@@ -618,11 +618,11 @@
wokViewModel.updateBeginTime(date.getTime());
jkMessage0202.timeBCD = date;
ExamPlatformData.getInstance().setExam_id(Utils.parseUnsignedInt(String.valueOf(date.getTime()/1000),10));
- jkMessage0202.ID = ExamPlatformData.getInstance().getID();
jkMessage0202.exam_id = ExamPlatformData.getInstance().getExam_id();
jkMessage0202.curr_exam = 0;
+ jkMessage0202.mode = ExamPlatformData.getInstance().getExamType()==ExamPlatformData.TRAINING_MODE?1:0;
MessageProcessor.getInstance().sendMessage(jkMessage0202);
}
@@ -639,11 +639,11 @@
wokViewModel.updateBeginTime(date.getTime());
jkMessage0202.timeBCD = date;
ExamPlatformData.getInstance().setExam_id(Utils.parseUnsignedInt(String.valueOf(date.getTime()/1000),10));
- jkMessage0202.ID = ExamPlatformData.getInstance().getID();
jkMessage0202.exam_id = ExamPlatformData.getInstance().getExam_id();
jkMessage0202.curr_exam = 1;
+ jkMessage0202.mode = ExamPlatformData.getInstance().getExamType()==ExamPlatformData.TRAINING_MODE?1:0;
MessageProcessor.getInstance().sendMessage(jkMessage0202);
}
@@ -711,7 +711,6 @@
jkMessage0204.timeBCD = new Date();
jkMessage0204.score = currTotalScore<0?0:currTotalScore;
jkMessage0204.stop = JKMessage0204.SUCC_STOP;
- jkMessage0204.ID = ExamPlatformData.getInstance().getID();
jkMessage0204.exam_id = ExamPlatformData.getInstance().getExam_id();
MessageProcessor.getInstance().sendMessage(jkMessage0204);
//璁剧疆妯″紡涓篘ONE 0
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java
index 99a1fbc..5eab933 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java
@@ -265,8 +265,8 @@
JKMessage0202 jkMessage0202 = new JKMessage0202();
jkMessage0202.timeBCD = new Date();
jkMessage0202.curr_exam = 1;
- jkMessage0202.ID = "123456789";
jkMessage0202.exam_id = ExamPlatformData.getInstance().getExam_id();
+ jkMessage0202.mode = ExamPlatformData.getInstance().getExamType()==ExamPlatformData.TRAINING_MODE?1:0;
MessageProcessor.getInstance().sendMessage(jkMessage0202);
break;
case R.id.btn_fail:
@@ -275,7 +275,6 @@
jkMessage0203.fail_item_id = 4;
jkMessage0203.fail_score = 10;
jkMessage0203.fail_reason = "鍙戝姩鏈哄惎鍔ㄥ悗锛屼笉鍙婃椂鏉惧紑鍚姩寮�鍏�";
- jkMessage0203.ID = "123456789";
jkMessage0203.exam_id = 123456;
MessageProcessor.getInstance().sendMessage(jkMessage0203);
break;
@@ -309,7 +308,6 @@
jkMessage0204.timeBCD = new Date();
jkMessage0204.score = 10;
jkMessage0204.stop = JKMessage0204.SUCC_STOP;
- jkMessage0204.ID = "123456789";
jkMessage0204.exam_id = 123456;
MessageProcessor.getInstance().sendMessage(jkMessage0204);
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 63f0a22..e0bfa59 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
@@ -598,7 +598,6 @@
wokViewModel.updateBeginTime(date.getTime());
jkMessage0202.timeBCD = date;
ExamPlatformData.getInstance().setExam_id(Utils.parseUnsignedInt(String.valueOf(date.getTime()/1000),10));
- jkMessage0202.ID = ExamPlatformData.getInstance().getID();
if (myDialogFragment == null){
myDialogFragment = new MyDialogFragment();
}
@@ -608,14 +607,14 @@
public void changKao() {
exam_type = 2;
- ExamPlatformData.getInstance().setTrainingMode(ExamPlatformData.TRAINING_MODE);
+ ExamPlatformData.getInstance().setTrainingMode(ExamPlatformData.TRAINING_MODE);//璁剧疆涓鸿缁冩ā寮�
ExamPlatformData.getInstance().setExamType(exam_type);
examStatusViewModel.updateStartExam(exam_type);
sendExamJson(1,exam_type);
ExamPlatformData.getInstance().getTTS().speak("寮�濮嬭缁�");
jkMessage0202.curr_exam = 0;
- ExamPlatformData.getInstance().setTrainingMode(ExamPlatformData.TRAINING_MODE);//璁剧疆涓鸿缁冩ā寮�
+ jkMessage0202.mode = ExamPlatformData.getInstance().getExamType()==ExamPlatformData.TRAINING_MODE?1:0;
MessageProcessor.getInstance().sendMessage(jkMessage0202);
}
@@ -629,7 +628,7 @@
sendExamJson(1,exam_type);
ExamPlatformData.getInstance().getTTS().speak("寮�濮嬭缁�");
jkMessage0202.curr_exam = 1;
-
+ jkMessage0202.mode = ExamPlatformData.getInstance().getExamType()==ExamPlatformData.TRAINING_MODE?1:0;
MessageProcessor.getInstance().sendMessage(jkMessage0202);
diff --git a/app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0202.java b/app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0202.java
index 70a6475..70ccedf 100644
--- a/app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0202.java
+++ b/app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0202.java
@@ -6,36 +6,46 @@
public class JKMessage0202 extends JK2019MessageBase {
+
@Order(1)
- @Length(18)
- @Ascii
- public String ID;
- @Order(2)
@BcdDateTime
public Date timeBCD;
- @Order(3)
+ @Order(2)
@Int32
public int exam_id;
- @Order(4)
+ @Order(3)
@Int8
public int curr_exam;
+ @Order(3)
+ @Int8
+ public int mode;
/**
- * 韬唤璇佸彿鐮�
- * BYTE[18]
- * 韬唤璇佸彿鐮�
- *
- * 鑰冭瘯寮�濮嬫椂闂�
- * BCD[6]
- * YYMMDDhhmmss
- *
- * 鑰冭瘯ID
- * DWORD
- * 鍞竴鑰冭瘯ID鏍囧織
+
*
*
* 鑰冭瘯绉戠洰
* BYTE
* 0-鍦鸿�冿紝1-璺��
+ * 璧峰瀛楄妭
+ * 瀛楁
+ * 鏁版嵁绫诲瀷
+ * 鎻忚堪鍙婅姹�
+ * 0
+ * 鏃堕棿
+ * BCD[6]
+ * YYMMDDhhmmss锛岃�冭瘯/璁粌寮�濮嬫椂闂达紝鍖椾含鏃堕棿
+ * 6
+ * 鍞竴ID
+ * DWORD
+ * 鍞竴鑰冭瘯/璁粌ID鏍囧織
+ * 10
+ * 绉戠洰
+ * BYTE
+ * 0-鍦鸿�冿紝1-璺��
+ * 11
+ * 妯″紡
+ * BYTE
+ * 0-鑰冭瘯锛�1-璁粌
*/
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0203.java b/app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0203.java
index 8ad68c9..29b08e0 100644
--- a/app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0203.java
+++ b/app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0203.java
@@ -11,34 +11,28 @@
import java.util.Date;
public class JKMessage0203 extends JK2019MessageBase {
- @Order(1)
- @Length(18)
- @Ascii
- public String ID;
- @Order(2)
+ @Order(1)
@BcdDateTime
public Date timeBCD;
- @Order(3)
+ @Order(2)
@Int32
public int exam_id;
- @Order(4)
+ @Order(3)
@Int8
public int fail_item_id;
- @Order(5)
+ @Order(4)
@Int8
public int fail_score;
//TODO Length 0 涔熷彲浠ュ畬鍏ㄦ樉绀哄瓧绗︿覆
- @Order(6)
+ @Order(5)
@Length(0)
@Ascii
public String fail_reason;
/**
- * 韬唤璇佸彿鐮�
- * BYTE[18]
- * 韬唤璇佸彿鐮�
+
*
* 鏃堕棿
* BCD[6]
diff --git a/app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0204.java b/app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0204.java
index 0c5c7ea..ce7a3b2 100644
--- a/app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0204.java
+++ b/app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage0204.java
@@ -16,19 +16,15 @@
public static final int TERMIAL_STOP = 2;
@Order(1)
- @Length(18)
- @Ascii
- public String ID;
- @Order(2)
@BcdDateTime
public Date timeBCD;
- @Order(3)
+ @Order(2)
@Int32
public int exam_id;
- @Order(4)
+ @Order(3)
@Int8
public int score;
- @Order(5)
+ @Order(4)
@Int8
public int stop;
diff --git a/app/src/main/java/safeluck/drive/evaluation/worker/TTSWorker.kt b/app/src/main/java/safeluck/drive/evaluation/worker/TTSWorker.kt
deleted file mode 100644
index 7545a09..0000000
--- a/app/src/main/java/safeluck/drive/evaluation/worker/TTSWorker.kt
+++ /dev/null
@@ -1,179 +0,0 @@
-package safeluck.drive.evaluation.worker
-
-import android.content.Context
-import android.text.TextUtils
-import androidx.work.Worker
-import androidx.work.WorkerParameters
-import com.anyun.exam.lib.MyLog
-import com.google.gson.Gson
-import com.google.gson.JsonParser
-import safeluck.drive.evaluation.Constant
-import safeluck.drive.evaluation.DB.WorkRoomDataBase
-import safeluck.drive.evaluation.bean.ExamPlatformData
-import safeluck.drive.evaluation.im.MessageProcessor
-import safeluck.drive.evaluation.platformMessage.JKMessage0203
-import safeluck.drive.evaluation.util.Utils
-import java.util.*
-
-/**
- * 涓�鏀跺埌杩滅▼鏈嶅姟缁欑殑璇勫垽娑堟伅
- * 瀹炵幇鎻掑叆绉戜簩銆佺涓夊け璐ラ」鐩〃
- * 鎾斁tts
- * 鍙戦��0203璇勫垽娑堟伅缁欐湇鍔″櫒
- */
-class TTSWorker(context: Context, workerParams: WorkerParameters) : Worker(context, workerParams) {
- var gson:Gson =Gson()
- override fun doWork(): Result {
- val jkMessage0203 = JKMessage0203()
- jkMessage0203.ID = ExamPlatformData.getInstance().id
- jkMessage0203.exam_id = ExamPlatformData.getInstance().exam_id
- var ttsInput = inputData.getString(Constant.TTS);
-
-
- val jsonArray = JsonParser.parseString(ttsInput).asJsonArray
-
- for ( i in 0 until jsonArray.size()) {
- val jsonObject = jsonArray[i].asJsonObject
- val emp_id = jsonObject["wrong_id"].asInt
-
- var utc = jsonObject["utc"].asString
- MyLog.i("璇勫垽娑堟伅瑙ｆ瀽涔嬪墠鐨剈tc=$utc")
- MyLog.i("wrong_id=$emp_id")
- utc = utc.substring(2, utc.length - 3)
- MyLog.i("璇勫垽娑堟伅瑙ｆ瀽涔嬪悗鐨剈tc=$utc")
- val sn = jsonObject["sn"].asInt
-
-
-// if(ExamPlatformData.getInstance().trainingMode == ExamPlatformData.EXAMING_MODE){
-// //鑰冭瘯妯″紡 鎬绘墸鍒嗗皬浜�80 鎵嶆姤瀛愬け璐ラ」鐩�
-// var totalDecutSocre:Int = 0;
-// if (emp_id>1000){
-// var ttsStr=WorkRoomDataBase.getWorkRoomDataBase(applicationContext).criteriaIIIDao.queryItemForCriteriaIIINoLive(emp_id-1000)
-// totalDecutSocre = ttsStr.score_deducting
-// if (totalDecutSocre > ExamPlatformData.getInstance().MAX_SCORE_DUCT){
-// ExamPlatformData.getInstance().tts.speak(ttsStr.getDeducting_reason() + if (ttsStr.getScore_deducting() == 100) "涓嶅悎鏍�" else "鎵�" +
-// ttsStr.getScore_deducting() + "鍒�")
-// }
-// }else{
-// var ttsStr=WorkRoomDataBase.getWorkRoomDataBase(applicationContext).criteriaIDao.queryItemForCriteriaINoLive(emp_id)
-// totalDecutSocre = ttsStr.score_deducting
-// if (totalDecutSocre > ExamPlatformData.getInstance().MAX_SCORE_DUCT){
-// ExamPlatformData.getInstance().tts.speak(ttsStr.getDeducting_reason() + if (ttsStr.getScore_deducting() == 100) "涓嶅悎鏍�" else "鎵�" +
-// ttsStr.getScore_deducting() + "鍒�")
-// }
-// }
-// if (totalDecutSocre>ExamPlatformData.getInstance().MAX_SCORE_DUCT){
-//
-// }else{
-// if (ExamPlatformData.getInstance().examType > ExamPlatformData.EXAM_TYPE_ChangKAO){
-// //璺��
-// var failedProjs = WorkRoomDataBase.getWorkRoomDataBase(applicationContext).luKaoFailProjDao.getAllFailProjIII(Constant.TEST_STU_ID)
-//
-// for (i in 0 until failedProjs.size){
-// totalDecutSocre+=failedProjs[i].score_deducting
-// if (totalDecutSocre>ExamPlatformData.getInstance().MAX_SCORE_DUCT){
-//
-// break;
-// }
-// }
-// if (totalDecutSocre>ExamPlatformData.getInstance().MAX_SCORE_DUCT){
-// for (i in 0 until failedProjs.size){
-// //鎵�鏈夊瓨鍦ㄦ暟鎹簱閲岀殑澶辫触椤�
-// var ttsStr=WorkRoomDataBase.getWorkRoomDataBase(applicationContext).criteriaIIIDao.queryItemForCriteriaIIINoLive(failedProjs[i].emp_id)
-// ExamPlatformData.getInstance().tts.speak(ttsStr.getDeducting_reason() + if (ttsStr.getScore_deducting() == 100) "涓嶅悎鏍�" else "鎵�" +
-// ttsStr.getScore_deducting() + "鍒�")
-// }
-// //鐜板湪澧炲姞鐨勪竴涓」鐩紝杩樻湭鎻掑叆鏁版嵁搴擄紱 emp_id>1000 璺�冪殑璇�
-// var ttsStr=WorkRoomDataBase.getWorkRoomDataBase(applicationContext).criteriaIIIDao.queryItemForCriteriaIIINoLive(emp_id-1000)
-// ExamPlatformData.getInstance().tts.speak(ttsStr.getDeducting_reason() + if (ttsStr.getScore_deducting() == 100) "涓嶅悎鏍�" else "鎵�" +
-// ttsStr.getScore_deducting() + "鍒�")
-// }
-//
-// }else{
-// //鍦鸿��
-// var failedProjs = WorkRoomDataBase.getWorkRoomDataBase(applicationContext).failProjDao.getAllFailProjI(Constant.TEST_STU_ID)
-//
-// for (i in 0 until failedProjs.size){
-// totalDecutSocre+=failedProjs[i].score_deducting
-// if (totalDecutSocre>ExamPlatformData.getInstance().MAX_SCORE_DUCT){
-// break;
-// }
-// }
-// if (totalDecutSocre>ExamPlatformData.getInstance().MAX_SCORE_DUCT){
-// for (i in 0 until failedProjs.size){
-// //鎵�鏈夊瓨鍦ㄦ暟鎹簱閲岀殑澶辫触椤�
-// var ttsStr=WorkRoomDataBase.getWorkRoomDataBase(applicationContext).criteriaIDao.queryItemForCriteriaINoLive(failedProjs[i].emp_id)
-// ExamPlatformData.getInstance().tts.speak(ttsStr.getDeducting_reason() + if (ttsStr.getScore_deducting() == 100) "涓嶅悎鏍�" else "鎵�" +
-// ttsStr.getScore_deducting() + "鍒�")
-// }
-// //鐜板湪澧炲姞鐨勪竴涓」鐩紝杩樻湭鎻掑叆鏁版嵁搴擄紱 emp_id>1000 璺�冪殑璇�
-// var ttsStr=WorkRoomDataBase.getWorkRoomDataBase(applicationContext).criteriaIDao.queryItemForCriteriaINoLive(emp_id)
-// ExamPlatformData.getInstance().tts.speak(ttsStr.getDeducting_reason() + if (ttsStr.getScore_deducting() == 100) "涓嶅悎鏍�" else "鎵�" +
-// ttsStr.getScore_deducting() + "鍒�")
-// }
-// }
-// }
-//
-// }else{
- //涓嶇浠�涔堟ā寮忓叏閮ㄦ姤 璇煶
- if (emp_id>1000){
- var ttsStr=WorkRoomDataBase.getWorkRoomDataBase(applicationContext).criteriaIIIDao.queryItemForCriteriaIIINoLive(emp_id-1000)
-// ExamPlatformData.getInstance().tts.speak(ttsStr.getDeducting_reason() + if (ttsStr.getScore_deducting() == 100) "涓嶅悎鏍�" else "鎵�" +
-// ttsStr.getScore_deducting() + "鍒�")
- jkMessage0203.fail_item_id = ttsStr.item_id
- jkMessage0203.fail_score = ttsStr.score_deducting
- jkMessage0203.fail_reason = ttsStr.deducting_reason
- }else{
- var ttsStr=WorkRoomDataBase.getWorkRoomDataBase(applicationContext).criteriaIDao.queryItemForCriteriaINoLive(emp_id)
-// ExamPlatformData.getInstance().tts.speak(ttsStr.getDeducting_reason() + if (ttsStr.getScore_deducting() == 100) "涓嶅悎鏍�" else "鎵�" +
-// ttsStr.getScore_deducting() + "鍒�")
- jkMessage0203.fail_item_id =ttsStr.item_id
- jkMessage0203.fail_score = ttsStr.score_deducting
- jkMessage0203.fail_reason = ttsStr.deducting_reason
- }
-// }
-
-
-
-
- if (!TextUtils.isEmpty(utc) && utc.length > 14) {
- utc = utc.substring(2, 14)
- }
- val date = Date(Utils.utc2NetWorkTime(utc))
-// jkMessage0203.timeBCD = date
-
-
-// MessageProcessor.getInstance().sendMessage(jkMessage0203)
-
-
-
-// if (emp_id<1000) { //鍦哄湴璇勫垽娑堟伅
-// if (emp_id > 31 || emp_id < 0) {
-// MyLog.i("emp_id瓒呭嚭鑼冨洿涓嶈兘鎻掑叆鏁版嵁搴擄紙I绫昏�冨満锛�")
-//
-// }else{
-// val failedProj = FailedProj(Constant.SUBJECT_I, emp_id, Constant.TEST_STU_ID, utc, sn)
-// MyLog.i("鎻掑叆fail_projects琛�=$failedProj")
-// WorkRoomDataBase.getWorkRoomDataBase(applicationContext).failProjDao.insert(failedProj)
-// }
-//
-// }
-// if (emp_id>1000) { //閬撹矾 璇勫垽娑堟伅
-//
-// if (emp_id >1066 || emp_id < 1000) {
-// MyLog.i("emp_id瓒呭嚭鑼冨洿涓嶈兘鎻掑叆鏁版嵁搴擄紙璺�冪被鑰冨満锛�")
-// }else{
-// val failedProj = LuKaoFailedProj(Constant.SUBJECT_III, (emp_id-1000), Constant.TEST_STU_ID, utc, sn)
-// MyLog.i("鎻掑叆璺�僨ail_projects琛�=$failedProj")
-// WorkRoomDataBase.getWorkRoomDataBase(applicationContext).luKaoFailProjDao.insert(failedProj)
-// }
-//
-// }
-
-
- }
-
-
- return Result.success()
- }
-}
\ No newline at end of file
--
Gitblit v1.8.0