From 40eb16208b55967ec994c00b4e873db9a1e175d0 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期日, 22 三月 2020 11:15:27 +0800
Subject: [PATCH] 优化log；实现联网考试、单机训练科二科三考试
---
app/src/main/java/safeluck/drive/evaluation/app.java | 40 +----
app/src/main/java/safeluck/drive/evaluation/MainActivity.java | 4
app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java | 8
im_lib/src/main/java/com/anyun/im_lib/util/PlatFormConstant.java | 9 +
app/src/main/java/safeluck/drive/evaluation/fragment/HomeFragment.java | 2
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java | 187 ++++++++++++++++--------------
im_lib/src/main/java/com/anyun/im_lib/netty/NettyTcpClient.java | 17 +-
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java | 30 ++--
app/src/main/java/safeluck/drive/evaluation/im/MessageProcessor.java | 7
9 files changed, 157 insertions(+), 147 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/MainActivity.java b/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
index 1ed7689..71fbd34 100644
--- a/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
+++ b/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
@@ -283,8 +283,11 @@
MyLog.i("TCP杩炴帴鎴愬姛");
//TODO 鍒ゆ柇SPUtils 鏄惁淇濆瓨鏈塪es瀵嗙爜锛涘鏋滄病鏈夊垯杩涜娉ㄥ唽JKMessage0100锛屽鏋滄湁瀵嗙爜鍒欒繘琛岄壌鏉僇KMessage0101
String hexPwd = (String) SPUtils.get(this,SPUtils.DES_HEX_PWD,"");
+ hexPwd="";
MessageProcessor.getInstance().addBeatHeart(10);
if (TextUtils.isEmpty(hexPwd)){
+
+ MyLog.i(PlatFormConstant.TAG,"瀵嗙爜涓嶅瓨鍦紝杩涜娉ㄥ唽锛屽彂閫佹敞鍐屾秷鎭�");
JKMessage0100 jkRegisterMessage = new JKMessage0100();
if (mRTKConfig!=null){
@@ -302,6 +305,7 @@
MessageProcessor.getInstance().sendMessage(jkRegisterMessage);
Log.i(TAG, "onClick: "+ BytesUtils.bytesToHexString(str)+" ============");
}else{
+ MyLog.i(PlatFormConstant.TAG,"瀵嗙爜瀛樺湪锛屽凡娉ㄥ唽杩囷紝鐩存帴鍙戦壌鏉冩秷鎭�");
JKMessage0101 jkMessage0101 = new JKMessage0101();
jkMessage0101.phone = ExamPlatformData.getInstance().getPhone();
String des = hexPwd;
diff --git a/app/src/main/java/safeluck/drive/evaluation/app.java b/app/src/main/java/safeluck/drive/evaluation/app.java
index 336d630..538d0c4 100644
--- a/app/src/main/java/safeluck/drive/evaluation/app.java
+++ b/app/src/main/java/safeluck/drive/evaluation/app.java
@@ -62,6 +62,7 @@
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;
@@ -192,35 +193,7 @@
Data judgeData = new Data.Builder().putString(Constant.TTS,json).build();
OneTimeWorkRequest ttswoker = new OneTimeWorkRequest.Builder(TTSWorker.class).setInputData(judgeData).build();
WorkManager.getInstance(getAppContext()).enqueue(ttswoker);
- JsonArray jsonArray = JsonParser.parseString(json).getAsJsonArray();
- for (int i = 0; i < jsonArray.size(); i++) {
- JsonObject jsonObject = jsonArray.get(i).getAsJsonObject();
- int emp_id = jsonObject.get("wrong_id").getAsInt();
- String utc = jsonObject.get("utc").getAsString();
- MyLog.i("璇勫垽娑堟伅瑙ｆ瀽涔嬪墠鐨剈tc="+utc);
- utc = utc.substring(2,utc.length()-3);
- MyLog.i("璇勫垽娑堟伅瑙ｆ瀽涔嬪悗鐨剈tc="+utc);
- int sn = jsonObject.get("sn").getAsInt();
-// if (ExamPlatformData.getInstance().getExamType()==2){//鍦哄湴璇勫垽娑堟伅
-// if (emp_id>31|| emp_id<0){
-// MyLog.i(TAG,"emp_id瓒呭嚭鑼冨洿涓嶈兘鎻掑叆鏁版嵁搴擄紙I绫昏�冨満锛�");
-// return;
-// }
-// FailedProj failedProj = new FailedProj(Constant.SUBJECT_I, emp_id, Constant.TEST_STU_ID,utc,sn);
-// MyLog.i("鎻掑叆fail_projects琛�="+failedProj.toString());
-// failedProjRepository.insert(failedProj);
-// }
-// if (ExamPlatformData.getInstance().getExamType()>2){//閬撹矾 璇勫垽娑堟伅
-// if (emp_id>66|| emp_id<1){
-// MyLog.i(TAG,"emp_id瓒呭嚭鑼冨洿涓嶈兘鎻掑叆鏁版嵁搴擄紙璺�冪被鑰冨満锛�");
-// return;
-// }
-// LuKaoFailedProj failedProj = new LuKaoFailedProj(Constant.SUBJECT_III, emp_id, Constant.TEST_STU_ID,utc,sn);
-// MyLog.i("鎻掑叆璺�僨ail_projects琛�="+failedProj.toString());
-// failedProjRepository.insertLuKao(failedProj);
-// }
- }
}
break;
@@ -388,6 +361,15 @@
e.printStackTrace();
}
+ }else{
+
+ String str = "鐧诲綍鏈垚鍔燂紝涓嶈兘鍙戦�佹秷鎭�=0206";
+ if (str.equalsIgnoreCase(last0206Str)){
+
+ }else{
+ last0206Str = str;
+ MyLog.i(PlatFormConstant.TAG,str);
+ }
}
break;
@@ -395,7 +377,7 @@
}
}
-
+private String last0206Str="";
private int lastSatNum= 0;
private int lastQf = 0;
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 6359ce5..4998672 100644
--- a/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java
+++ b/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java
@@ -109,8 +109,8 @@
private Speaker speaker = null;
- private String ip;
- private int port;
+ private String ip="47.93.80.84";
+ private int port=12125;
private String mapPath;//缁濆璺緞鍖呭惈鏂囦欢鍚嶇殑path
private String carPath;//缁濆璺緞鍖呭惈鏂囦欢鍚嶇殑path
private StringBuffer stringBuffer;
@@ -127,12 +127,12 @@
}
public String getPlatformIP(){
- ip = (String) SPUtils.get(app.getAppContext(),SPUtils.PLATFORM_IP,"47.93.157.103");
+ ip = (String) SPUtils.get(app.getAppContext(),SPUtils.PLATFORM_IP,"47.93.80.84");
return ip;
}
public int getPlatformPort(){
- port = (int) SPUtils.get(app.getAppContext(),SPUtils.PLATFORM_PORT,2020);
+ port = (int) SPUtils.get(app.getAppContext(),SPUtils.PLATFORM_PORT,12125);
return port;
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/HomeFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/HomeFragment.java
index 7c09ee9..530ce5b 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/HomeFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/HomeFragment.java
@@ -67,7 +67,7 @@
case R.id.car_train:
//鍗曟満璁粌
if (ExamPlatformData.getInstance().getTrainingMode()==ExamPlatformData.EXAMING_MODE){
- Toast.makeText(_mActivity, "褰撳墠姝ｅ浜庤�冭瘯妯″紡锛屾棤娉曡繘鍏ュ崟鍑昏缁冿紝璇峰厛缁撴潫鑰冭瘯", Toast.LENGTH_SHORT).show();
+ Toast.makeText(_mActivity, "褰撳墠姝ｅ浜庤�冭瘯妯″紡锛屾棤娉曡繘鍏ュ崟鏈鸿缁冿紝璇峰厛缁撴潫鑰冭瘯", Toast.LENGTH_SHORT).show();
}else{
TrainFragment trainFragment = findFragment(TrainFragment.class);
if (trainFragment == null) {
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 c47883a..4527745 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
@@ -426,7 +426,6 @@
return view;
}
- private List<Integer> sns =new ArrayList<>();
@@ -540,8 +539,6 @@
}
});
- //娓呯┖sns
- sns.clear();
@@ -552,18 +549,22 @@
break;
case R.id.view_map:
-// MapFragment mapFragment = findFragment(MapFragment.class);
-// MyLog.i(TAG,"鏌ョ湅鍦板浘");
-// if (mapFragment == null) {
-// mapFragment = (MapFragment) MapFragment.newInstance();
-// }
-// start(mapFragment);
- RoadDriveMapFragmentaa mapFragment = findFragment(RoadDriveMapFragmentaa.class);
- MyLog.i(TAG,"鏌ョ湅鍦板浘");
- if (mapFragment == null) {
- mapFragment = (RoadDriveMapFragmentaa) RoadDriveMapFragmentaa.newInstance();
+ if (ExamPlatformData.getInstance().getExamType()>ExamPlatformData.EXAM_TYPE_ChangKAO){
+ RoadDriveMapFragmentaa mapFragment = findFragment(RoadDriveMapFragmentaa.class);
+ MyLog.i(TAG,"鏌ョ湅璺�冨湴鍥�");
+ if (mapFragment == null) {
+ mapFragment = (RoadDriveMapFragmentaa) RoadDriveMapFragmentaa.newInstance();
+ }
+ start(mapFragment);
+ }else{
+ MapFragment mapFragment = findFragment(MapFragment.class);
+ MyLog.i(TAG,"鏌ョ湅鍦鸿�冨湴鍥�");
+ if (mapFragment == null) {
+ mapFragment = (MapFragment) MapFragment.newInstance();
+ }
+ start(mapFragment);
}
- start(mapFragment);
+
break;
case R.id.btn_return:
_mActivity.onBackPressed();
@@ -594,7 +595,6 @@
private void stopExam() {
MyLog.i(TAG,"缁撴潫鑰冭瘯");
- sns.clear();
//璁剧疆妯″紡涓篘ONE 0
ExamPlatformData.getInstance().setTrainingMode(ExamPlatformData.MODE_NONE);
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 9ef6df9..2d8e244 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
@@ -283,46 +283,98 @@
initView(view);
failedProjViewModel = ViewModelProviders.of(this).get(FailedProjViewModel.class);
+
+
+ failedProjViewModel.getFailedProjectsForIII(Constant.TEST_STU_ID).observe(this, new Observer<List<FailedProj_select>>() {
+ @Override
+ public void onChanged(List<FailedProj_select> failedProj_selects) {
+ if (ExamPlatformData.getInstance().getExamType()>ExamPlatformData.EXAM_TYPE_ChangKAO){
+ MyLog.i("鐜板湪鏄矾鑰冪姸鎬侊紝鐩戣璺�冩暟鎹け璐ラ」鐩�");
+ if (failedProj_selects != null && failedProj_selects.size()>0){
+
+ item_id = 0;
+ currTotalScore = 100;
+ mArrayList.clear();
+ item_conents.clear();
+ for (FailedProj_select f :
+ failedProj_selects) {
+ item_id += f.getScore_deducting();
+ Log.i(TAG, "onChanged: " + f.toString());
+ mArrayList.add(new ScoreBean(f.getScore_deducting(), f.getItem_content(), f.getDeducting_reason()));
+ item_conents.add(f.getItem_content());
+ Collections.reverse(mArrayList);
+ mScoreAdapter.addDatas(mArrayList);
+ MyLog.i("item_score="+item_id);
+ }
+ MyLog.i("娌℃墸鍒嗕箣鍓嶅緱鍒嗭細"+currTotalScore);
+ currTotalScore -=item_id;
+ MyLog.i("璺�冨綋鍓嶅緱鍒嗭細"+currTotalScore);
+ if (currTotalScore < Constant.PASSING_SCORE){
+ MyLog.i("璺�冧綆浜�80锛屼笉鍚堟牸"+currTotalScore);
+// ExamPlatformData.getInstance().getTTS().speak("鑰冭瘯涓嶅悎鏍�");
+// stopExam();
+ }
+ MyLog.i("璺�冪洃娴嬪埌鏈夊け璐ラ」鐩姞鍏ワ紝閫氱煡UI鏇存柊棰滆壊");
+ mHandler.obtainMessage(ADD_DATA).sendToTarget();
+ }else{
+ MyLog.i(TAG,"璺�冨け璐ラ」鐩暟鎹〃琚竻绌烘洿鏂癠I");
+ item_id = 0;
+ mArrayList.clear();
+ item_conents.clear();
+ Collections.reverse(mArrayList);
+ mScoreAdapter.addDatas(mArrayList);
+ mHandler.obtainMessage(ADD_DATA).sendToTarget();
+ }
+ }
+
+ }
+ });
+
+
+
failedProjViewModel.getFailedProjectsForI(Constant.TEST_STU_ID).observe(this, new Observer<List<FailedProj_select>>() {
@Override
public void onChanged(List<FailedProj_select> failedProj_selects) {
- if (failedProj_selects != null && failedProj_selects.size()>0){
+ if (ExamPlatformData.getInstance().getExamType()<=ExamPlatformData.EXAM_TYPE_ChangKAO){
+ if (failedProj_selects != null && failedProj_selects.size()>0){
- item_id = 0;
- currTotalScore = 100;
- mArrayList.clear();
- item_conents.clear();
- for (FailedProj_select f :
- failedProj_selects) {
- item_id += f.getScore_deducting();
- Log.i(TAG, "onChanged: " + f.toString());
- mArrayList.add(new ScoreBean(f.getScore_deducting(), f.getItem_content(), f.getDeducting_reason()));
- item_conents.add(f.getItem_content());
- Collections.reverse(mArrayList);
- mScoreAdapter.addDatas(mArrayList);
- MyLog.i("item_score="+item_id);
- }
- //TODO 鍙戦�丣KMessage0203 缁欏钩鍙帮紝杩欏効鏈夌偣澶嶆潅锛岀湅鎬庝箞澶勭悊
+ item_id = 0;
+ currTotalScore = 100;
+ mArrayList.clear();
+ item_conents.clear();
+ for (FailedProj_select f :
+ failedProj_selects) {
+ item_id += f.getScore_deducting();
+ Log.i(TAG, "onChanged: " + f.toString());
+ mArrayList.add(new ScoreBean(f.getScore_deducting(), f.getItem_content(), f.getDeducting_reason()));
+ item_conents.add(f.getItem_content());
+ Collections.reverse(mArrayList);
+ mScoreAdapter.addDatas(mArrayList);
+ MyLog.i("item_score="+item_id);
+ }
+ //TODO 鍙戦�丣KMessage0203 缁欏钩鍙帮紝杩欏効鏈夌偣澶嶆潅锛岀湅鎬庝箞澶勭悊
// sendJKMessage0203(failedProj_selects);
- MyLog.i("娌℃墸鍒嗕箣鍓嶅緱鍒嗭細"+currTotalScore);
- currTotalScore -=item_id;
- MyLog.i("褰撳墠寰楀垎锛�"+currTotalScore);
- if (currTotalScore < Constant.PASSING_SCORE){
- MyLog.i("浣庝簬80锛屼笉鍚堟牸"+currTotalScore);
+ MyLog.i("娌℃墸鍒嗕箣鍓嶅緱鍒嗭細"+currTotalScore);
+ currTotalScore -=item_id;
+ MyLog.i("褰撳墠寰楀垎锛�"+currTotalScore);
+ if (currTotalScore < Constant.PASSING_SCORE){
+ MyLog.i("浣庝簬80锛屼笉鍚堟牸"+currTotalScore);
// ExamPlatformData.getInstance().getTTS().speak("鑰冭瘯涓嶅悎鏍�");
// stopExam();
+ }
+ MyLog.i("鐩戞祴鍒版湁澶辫触椤圭洰鍔犲叆锛岄�氱煡UI鏇存柊棰滆壊");
+ mHandler.obtainMessage(ADD_DATA).sendToTarget();
+ }else{
+ MyLog.i(TAG,"澶辫触椤圭洰鏁版嵁琛ㄨ娓呯┖鏇存柊UI");
+ item_id = 0;
+ mArrayList.clear();
+ item_conents.clear();
+ Collections.reverse(mArrayList);
+ mScoreAdapter.addDatas(mArrayList);
+ mHandler.obtainMessage(ADD_DATA).sendToTarget();
}
- MyLog.i("鐩戞祴鍒版湁澶辫触椤圭洰鍔犲叆锛岄�氱煡UI鏇存柊棰滆壊");
- mHandler.obtainMessage(ADD_DATA).sendToTarget();
- }else{
- MyLog.i(TAG,"澶辫触椤圭洰鏁版嵁琛ㄨ娓呯┖鏇存柊UI");
- item_id = 0;
- mArrayList.clear();
- item_conents.clear();
- Collections.reverse(mArrayList);
- mScoreAdapter.addDatas(mArrayList);
- mHandler.obtainMessage(ADD_DATA).sendToTarget();
}
+
}
});
@@ -395,53 +447,6 @@
return view;
}
-// private void sendJKMessage0203(List<FailedProj_select> failedProj_selects) {
-//// JKMessage0203 jkMessage0203 = new JKMessage0203();
-//// jkMessage0203.phone = ExamPlatformData.getInstance().getPhone();
-//// jkMessage0203.ID = ExamPlatformData.getInstance().getID();
-//// jkMessage0203.exam_id = ExamPlatformData.getInstance().getExam_id();
-////
-//// for (int i = 0; i < failedProj_selects.size(); i++) {
-//// if (hasSnEqulas(failedProj_selects.get(i).getSn())){
-//// MyLog.i("sn鐩稿悓"+failedProj_selects.get(i).getSn());
-//// }else{
-//// ExamPlatformData.getInstance().getTTS().speak(failedProj_selects.get(i).getDeducting_reason()+(
-//// failedProj_selects.get(i).getScore_deducting()==100?"涓嶅悎鏍�":"鎵�"+
-//// failedProj_selects.get(i).getScore_deducting()+"鍒�"));
-//// MyLog.i("娌℃湁鐩稿悓鐨剆n锛屽彂閫�"+failedProj_selects.get(i).getSn());
-//// ExamPlatformData.getInstance().addSn(failedProj_selects.get(i).getSn());
-//// String utc = failedProj_selects.get(i).getUtc();
-//// if (!TextUtils.isEmpty(utc)&&utc.length()>12){
-//// utc =utc.substring(0,12);
-//// }
-//// jkMessage0203.timeBCD = utc ;
-////
-//// jkMessage0203.fail_item_id = failedProj_selects.get(i).getEmp_id();
-//// jkMessage0203.fail_score = failedProj_selects.get(i).getScore_deducting();
-//// jkMessage0203.fail_reason = failedProj_selects.get(i).getDeducting_reason();
-//// }
-////
-//// }
-//
-//// MessageProcessor.getInstance().sendMessage(jkMessage0203);
-//// }
-//
-//// private boolean hasSnEqulas(int failedProjSn){
-//// if (ExamPlatformData.getInstance().getSns().size() > 0){
-//// for (int j = 0; j < ExamPlatformData.getInstance().getSns().size(); j++) {
-//// MyLog.i("宸插瓨鍦ㄧ殑sn"+ExamPlatformData.getInstance().getSns().get(j));
-//// if (ExamPlatformData.getInstance().getSns().get(j) == failedProjSn){
-//// MyLog.i("sn鐩稿悓锛屼笉鍙�"+ExamPlatformData.getInstance().getSns().get(j));
-//// return true;
-// }else{
-// continue;
-// }
-// }
-//
-// }
-// return false;
-//
-// }
@@ -532,6 +537,7 @@
public void changKao() {
exam_type = 2;
iv_head.getDrawable().setLevel(1);
+ ExamPlatformData.getInstance().setTrainingMode(ExamPlatformData.TRAINING_MODE);
ExamPlatformData.getInstance().setExamType(exam_type);
examStatusViewModel.updateStartExam(exam_type);
sendExamJson(1,exam_type);
@@ -546,6 +552,7 @@
@Override
public void luKao() {
exam_type = 3;
+ ExamPlatformData.getInstance().setTrainingMode(ExamPlatformData.TRAINING_MODE);
ExamPlatformData.getInstance().setExamType(exam_type);
examStatusViewModel.updateStartExam(exam_type);
sendExamJson(1,exam_type);
@@ -570,12 +577,21 @@
break;
case R.id.view_map:
- MapFragment mapFragment = findFragment(MapFragment.class);
- MyLog.i(TAG,"鏌ョ湅鍦板浘");
- if (mapFragment == null) {
- mapFragment = (MapFragment) MapFragment.newInstance();
+ if (ExamPlatformData.getInstance().getExamType()>ExamPlatformData.EXAM_TYPE_ChangKAO){
+ RoadDriveMapFragmentaa mapFragment = findFragment(RoadDriveMapFragmentaa.class);
+ MyLog.i(TAG,"鏌ョ湅璺�冨湴鍥�");
+ if (mapFragment == null) {
+ mapFragment = (RoadDriveMapFragmentaa) RoadDriveMapFragmentaa.newInstance();
+ }
+ start(mapFragment);
+ }else{
+ MapFragment mapFragment = findFragment(MapFragment.class);
+ MyLog.i(TAG,"鏌ョ湅鍦鸿�冨湴鍥�");
+ if (mapFragment == null) {
+ mapFragment = (MapFragment) MapFragment.newInstance();
+ }
+ start(mapFragment);
}
- start(mapFragment);
break;
case R.id.btn_return:
_mActivity.onBackPressed();
@@ -604,10 +620,7 @@
}
private void stopExam() {
- MyLog.i(TAG,"缁撴潫鑰冭瘯");
-
- //娓呯┖sns
- ExamPlatformData.getInstance().clearSns();
+ MyLog.i(TAG,"缁撴潫璁粌");
//璁剧疆妯″紡涓篘ONE 0
ExamPlatformData.getInstance().setTrainingMode(ExamPlatformData.MODE_NONE);
diff --git a/app/src/main/java/safeluck/drive/evaluation/im/MessageProcessor.java b/app/src/main/java/safeluck/drive/evaluation/im/MessageProcessor.java
index 9978a11..b37cd0d 100644
--- a/app/src/main/java/safeluck/drive/evaluation/im/MessageProcessor.java
+++ b/app/src/main/java/safeluck/drive/evaluation/im/MessageProcessor.java
@@ -67,7 +67,7 @@
//鍙嶈浆涔�
byte[] datas=messageEscaper.unescape(message);
- MyLog.i(PlatFormConstant.TAG,"杞箟杩囧悗鐨勬湇鍔℃秷鎭細"+ BytesUtils.bytesToHexString(datas));
+ MyLog.i(PlatFormConstant.TAG,"鏈嶅姟娑堟伅锛�"+ BytesUtils.bytesToHexString(datas));
JK2019MessageBase jk2019MessageBase = MessageManager.get(BytesUtils.bytesToHexString(datas));
if (jk2019MessageBase instanceof JKMessage8100){
if (((JKMessage8100) jk2019MessageBase).result == JKMessage8100.SUCCESS){
@@ -83,6 +83,7 @@
byte[] miwen =Utils.encrypt(ByteUtil.intGetBytes(unsignedInt),des);
MyLog.i(PlatFormConstant.TAG,"閴存潈瀵嗘枃="+BytesUtils.bytesToHexString(miwen)+" time="+unsignedInt);
jkMessage0101.des = BytesUtils.bytesToHexString(miwen);
+ MyLog.i(PlatFormConstant.TAG,"鍙戦�侀壌鏉冩秷鎭�");
sendMessage(jkMessage0101);
ExamPlatformData.getInstance().setExamplatformStatus(ExamPlatformData.DEV_REGISTERED);
}else{
@@ -130,11 +131,11 @@
String msgid = BytesUtils.bytesToHexString(msgidbytes);
Log.i(TAG, "run: msgid="+msgid);
if ((msgid.equalsIgnoreCase("0100")) || (msgid.equalsIgnoreCase("0101"))){
-
+ MyLog.i(PlatFormConstant.TAG,"娉ㄥ唽/閴存潈娑堟伅鐩存帴鍙戦�侊紝涓嶅彂閫佹槸鍚︾櫥褰曟垚鍔�");
if (IMSClientBootstrap.getInstance().isActive()){
IMSClientBootstrap.getInstance().sendMessage(messageEscaper.escape(msg.toBytes()));
}else{
- Log.e(TAG, "run: 鍙戦�佹秷鎭け璐ワ紝鏈垵濮嬪寲杩炴帴NettyTcp");
+ MyLog.i(PlatFormConstant.TAG, "鍙戦�佹秷鎭け璐ワ紝鏈垵濮嬪寲杩炴帴NettyTcp");
}
}else{
MyLog.i(PlatFormConstant.TAG,"鐧诲綍鏈垚鍔燂紝涓嶈兘鍙戦�佹秷鎭�="+msgid);
diff --git a/im_lib/src/main/java/com/anyun/im_lib/netty/NettyTcpClient.java b/im_lib/src/main/java/com/anyun/im_lib/netty/NettyTcpClient.java
index 17ed3bf..b0953bd 100644
--- a/im_lib/src/main/java/com/anyun/im_lib/netty/NettyTcpClient.java
+++ b/im_lib/src/main/java/com/anyun/im_lib/netty/NettyTcpClient.java
@@ -13,6 +13,7 @@
import com.anyun.im_lib.listener.OnEventListener;
import com.anyun.im_lib.util.ByteUtil;
import com.anyun.im_lib.util.MyLog;
+import com.anyun.im_lib.util.PlatFormConstant;
import com.safeluck.aykj.utils.BytesUtils;
import java.nio.ByteBuffer;
@@ -183,7 +184,7 @@
try {
channel = bootstrap.connect(currentHost,currentPort).sync().channel();
} catch (Exception e) {
- Log.i(TAG, String.format("杩炴帴Server(ip[%s],port[%d]澶辫触)",currentHost,currentPort));
+ MyLog.i(PlatFormConstant.TAG, String.format("杩炴帴Server(ip[%s],port[%d]澶辫触)",currentHost,currentPort));
try {
Thread.sleep(500);
} catch (InterruptedException ex) {
@@ -210,13 +211,13 @@
this.connectStatus = connectStateConnecting;
switch (connectStatus){
case IMSConfig.CONNECT_STATE_CONNECTING:
- Log.i(TAG, "onConnectStatusCallback: ims杩炴帴涓�...");
+ MyLog.i(PlatFormConstant.TAG, "onConnectStatusCallback: ims杩炴帴涓�...");
if (imsConnectStatusCallback != null){
imsConnectStatusCallback.onConnecting();
}
break;
case IMSConfig.CONNECT_STATE_SUCCESSFUL:
- MyLog.i(String.format("onConnectStatusCallback: ims杩炴帴鎴愬姛锛宧ost[%s],port[%s]",currentHost,currentPort));
+ MyLog.i(PlatFormConstant.TAG,String.format("onConnectStatusCallback: ims杩炴帴鎴愬姛锛宧ost[%s],port[%s]",currentHost,currentPort));
if (imsConnectStatusCallback != null){
imsConnectStatusCallback.onConnected();
}
@@ -232,7 +233,7 @@
break;
case IMSConfig.CONNECT_STATE_FAILURE:
default:
- MyLog.i( "onConnectStatusCallback: ims杩炴帴澶辫触");
+ MyLog.i( PlatFormConstant.TAG," ims杩炴帴澶辫触");
if (imsConnectStatusCallback != null){
imsConnectStatusCallback.onConnectFailed();
}
@@ -336,12 +337,12 @@
return;
}
try {
- MyLog.i("PlatformMessage", "sendMsg: "+ BytesUtils.bytesToHexString(msg));
+ MyLog.i(PlatFormConstant.TAG, "瀹㈡埛绔秷鎭紙杞箟鍚庯級锛�"+ BytesUtils.bytesToHexString(msg));
ByteBuf byteBuf = ByteBufAllocator.DEFAULT.ioBuffer();
byteBuf.writeBytes(msg);
channel.writeAndFlush(byteBuf);
} catch (Exception e) {
- Log.i("PlatformMessage", "鍙戦�佹秷鎭け璐ワ紝reason="+e.getMessage()+"\t"+msg);
+ MyLog.i(PlatFormConstant.TAG, "瀹㈡埛绔彂閫佹秷鎭け璐ワ紝reason="+e.getMessage()+"\t"+msg);
}
}
@@ -456,7 +457,7 @@
@Override
public void run() {
- MyLog.i(TAG, "鎵ц閲嶈繛浠诲姟");
+ MyLog.i(PlatFormConstant.TAG, "鎵ц閲嶈繛浠诲姟");
if (!isFirst){
onConnectStatusCallback(IMSConfig.CONNECT_STATE_FAILURE);
}
@@ -536,7 +537,7 @@
if(connectStatus != IMSConfig.CONNECT_STATE_CONNECTING){
onConnectStatusCallback(IMSConfig.CONNECT_STATE_CONNECTING);
}
- MyLog.i( String.format("姝ｅ湪杩涜connectServer銆�%s銆戠殑绗琜%d]杩炴帴锛屽綋鍓嶉噸杩炲欢鏃舵椂闀夸负[%dms]: ",serverUrl,j,j*getReconnectInterval()));
+ MyLog.i(PlatFormConstant.TAG, String.format("姝ｅ湪杩涜connectServer銆�%s銆戠殑绗琜%d]杩炴帴锛屽綋鍓嶉噸杩炲欢鏃舵椂闀夸负[%dms]: ",serverUrl,j,j*getReconnectInterval()));
try {
currentPort = Integer.parseInt(address[1]);
currentHost = address[0];
diff --git a/im_lib/src/main/java/com/anyun/im_lib/util/PlatFormConstant.java b/im_lib/src/main/java/com/anyun/im_lib/util/PlatFormConstant.java
new file mode 100644
index 0000000..7ec9967
--- /dev/null
+++ b/im_lib/src/main/java/com/anyun/im_lib/util/PlatFormConstant.java
@@ -0,0 +1,9 @@
+package com.anyun.im_lib.util;
+
+public class PlatFormConstant {
+
+ public static final String TAG = "PlatFormMessage";
+
+ public static final int SUCCESS = 0;
+ public static final short STU_INFO_SUCC = 1;
+}
--
Gitblit v1.8.0