From 17985fd2009cdc83aba5583c65358c51b5471e54 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期六, 22 二月 2020 13:37:23 +0800
Subject: [PATCH] 注册成功之后自动发鉴权；在”联网考试“中添加开始、结束考试，获取人员信息，
---
app/src/main/java/safeluck/drive/evaluation/app.java | 42 -------------
app/src/main/java/safeluck/drive/evaluation/MainActivity.java | 53 +++++++++++++++++
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java | 24 ++++++++
app/src/main/java/safeluck/drive/evaluation/im/MessageProcessor.java | 4 +
4 files changed, 82 insertions(+), 41 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/MainActivity.java b/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
index 508ddea..9660920 100644
--- a/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
+++ b/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
@@ -8,6 +8,7 @@
import android.os.AsyncTask;
import android.os.Bundle;
+import android.text.TextUtils;
import android.util.Log;
import android.widget.Toast;
@@ -32,7 +33,9 @@
import com.anyun.exam.lib.AYSdk;
import com.anyun.exam.lib.MyLog;
import com.anyun.exam.lib.util.ByteUtil;
+import com.anyun.im_lib.listener.IMSConnectStatusCallback;
import com.google.gson.Gson;
+import com.safeluck.aykj.utils.BytesUtils;
import org.json.JSONException;
import org.json.JSONObject;
@@ -43,14 +46,19 @@
import java.util.List;
import java.util.concurrent.ArrayBlockingQueue;
+import safeluck.drive.evaluation.im.IMSClientBootstrap;
+import safeluck.drive.evaluation.im.MessageProcessor;
+import safeluck.drive.evaluation.platformMessage.JKMessage0100;
+import safeluck.drive.evaluation.platformMessage.JKMessage0101;
import safeluck.drive.evaluation.util.CThreadPoolExecutor;
import safeluck.drive.evaluation.util.FileUtil;
import safeluck.drive.evaluation.util.PermissionManager;
+import safeluck.drive.evaluation.util.SPUtils;
import safeluck.drive.evaluation.viewmodels.MainViewModel;
import safeluck.drive.evaluation.viewmodels.RTKConnAndLogin;
import safeluck.drive.evaluation.viewmodels.RTKConnAndLoginViewModel;
-public class MainActivity extends SupportActivity {
+public class MainActivity extends SupportActivity implements IMSConnectStatusCallback {
private static final int PERMISSIONS_REQUEST_CODE = 1001;
private String TAG = MainActivity.class.getCanonicalName();
@@ -61,6 +69,7 @@
String[] PERMISSIONS = new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA};
RTKConfigViewModel rtkConfigViewModel;
private boolean onlySendOnceRTKConfig = true;
+
private ICEventListener icEventListener = new ICEventListener() {
@Override
@@ -147,6 +156,12 @@
//鍏ㄥ睆
setContentView(R.layout.activity_main);
+ // TODO
+ // 杩涜tcp杩炴帴
+ String userId = "100002";
+ String token = "token_" + userId;
+ String hosts = "[{\"host\":\"192.168.31.77\", \"port\":12125}]";
+ IMSClientBootstrap.getInstance().init(userId,token,hosts,1,this);
WokViewModel wokViewModel = ViewModelProviders.of(this).get(WokViewModel.class);
wokViewModel.getStudents().observe(this, new Observer<List<Student>>() {
@@ -296,4 +311,40 @@
return false;
}
+ @Override
+ public void onConnecting() {
+ MyLog.i(TAG,"TCP onConnecting");
+ }
+
+ @Override
+ public void onConnected() {
+ MyLog.i(TAG,"TCP杩炴帴鎴愬姛");
+ //TODO 鍒ゆ柇SPUtils 鏄惁淇濆瓨鏈塪es瀵嗙爜锛涘鏋滄病鏈夊垯杩涜娉ㄥ唽JKMessage0100锛屽鏋滄湁瀵嗙爜鍒欒繘琛岄壌鏉僇KMessage0101
+ String hexPwd = (String) SPUtils.get(this,SPUtils.DES_HEX_PWD,"");
+ if (TextUtils.isEmpty(hexPwd)){
+
+ JKMessage0100 jkRegisterMessage = new JKMessage0100();
+ jkRegisterMessage.proviceid = 23;
+ jkRegisterMessage.cityid = 1;
+ jkRegisterMessage.imei = "460123874561";
+ jkRegisterMessage.model = "123";
+ jkRegisterMessage.sn = "0314200100000004";
+
+ Log.i(TAG, "onClick: msg len "+jkRegisterMessage.getMessageLen()+" "+ jkRegisterMessage.props.value);
+ byte[] str = jkRegisterMessage.toBytes();
+ MessageProcessor.getInstance().sendMessage(jkRegisterMessage);
+ Log.i(TAG, "onClick: "+ BytesUtils.bytesToHexString(str)+" ============");
+ }else{
+ JKMessage0101 jkMessage0101 = new JKMessage0101();
+ jkMessage0101.des =hexPwd;
+ jkMessage0101.timestamp = (int) System.currentTimeMillis();
+ MessageProcessor.getInstance().sendMessage(jkMessage0101);
+ }
+ }
+
+ @Override
+ public void onConnectFailed() {
+ MyLog.i(TAG,"TCP杩炴帴澶辫触");
+ }
+
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/app.java b/app/src/main/java/safeluck/drive/evaluation/app.java
index 370b201..bca1dd3 100644
--- a/app/src/main/java/safeluck/drive/evaluation/app.java
+++ b/app/src/main/java/safeluck/drive/evaluation/app.java
@@ -64,7 +64,7 @@
* 閭锛�632393724@qq.com
* All Rights Saved! Chongqing AnYun Tech co. LTD
*/
-public class app extends Application implements IAYExamListener , IMSConnectStatusCallback {
+public class app extends Application implements IAYExamListener {
private static final String TAG = "app";
private Gson gson;
@@ -112,11 +112,7 @@
}
}).start();
- // 杩涜tcp杩炴帴
- String userId = "100002";
- String token = "token_" + userId;
- String hosts = "[{\"host\":\"192.168.31.77\", \"port\":12125}]";
- IMSClientBootstrap.getInstance().init(userId,token,hosts,1,this);
+
}
@@ -295,39 +291,5 @@
}
- @Override
- public void onConnecting() {
- }
-
- @Override
- public void onConnected() {
- MyLog.i(TAG,"TCP杩炴帴鎴愬姛");
- //TODO 鍒ゆ柇SPUtils 鏄惁淇濆瓨鏈塪es瀵嗙爜锛涘鏋滄病鏈夊垯杩涜娉ㄥ唽JKMessage0100锛屽鏋滄湁瀵嗙爜鍒欒繘琛岄壌鏉僇KMessage0101
- String hexPwd = (String) SPUtils.get(this,SPUtils.DES_HEX_PWD,"");
- if (TextUtils.isEmpty(hexPwd)){
-
- JKMessage0100 jkRegisterMessage = new JKMessage0100();
- jkRegisterMessage.proviceid = 23;
- jkRegisterMessage.cityid = 1;
- jkRegisterMessage.imei = "460123874561";
- jkRegisterMessage.model = "123";
- jkRegisterMessage.sn = "0314200100000004";
-
- Log.i(TAG, "onClick: msg len "+jkRegisterMessage.getMessageLen()+" "+ jkRegisterMessage.props.value);
- byte[] str = jkRegisterMessage.toBytes();
- MessageProcessor.getInstance().sendMessage(jkRegisterMessage);
- Log.i(TAG, "onClick: "+ BytesUtils.bytesToHexString(str)+" ============");
- }else{
- JKMessage0101 jkMessage0101 = new JKMessage0101();
- jkMessage0101.des =hexPwd;
- jkMessage0101.timestamp = (int) System.currentTimeMillis();
- MessageProcessor.getInstance().sendMessage(jkMessage0101);
- }
- }
-
- @Override
- public void onConnectFailed() {
- MyLog.i(TAG,"TCP杩炴帴澶辫触");
- }
}
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 702c122..eeb855a 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
@@ -32,6 +32,7 @@
import java.util.ArrayList;
import java.util.Collections;
+import java.util.Date;
import java.util.List;
import me.yokeyword.fragmentation.SupportFragment;
@@ -50,6 +51,10 @@
import safeluck.drive.evaluation.cEventCenter.ICEventListener;
import safeluck.drive.evaluation.customview.ArrowView;
import safeluck.drive.evaluation.customview.HouseView;
+import safeluck.drive.evaluation.im.MessageProcessor;
+import safeluck.drive.evaluation.platformMessage.JKMessage0201;
+import safeluck.drive.evaluation.platformMessage.JKMessage0202;
+import safeluck.drive.evaluation.platformMessage.JKMessage0204;
/**
* 鑱旂綉璁粌UI
@@ -298,6 +303,13 @@
sendExamJson(1);
iv_head.getDrawable().setLevel(1);
//TODO 鍙戦�丣KMessage0202 缁欏钩鍙帮紝寮�濮嬭�冭瘯
+ JKMessage0202 jkMessage0202 = new JKMessage0202();
+ jkMessage0202.phone = "0314200100000004";
+ jkMessage0202.timeBCD = new Date();
+ jkMessage0202.curr_exam = 1;
+ jkMessage0202.ID = "123456789";
+ jkMessage0202.exam_id = 123456;
+ MessageProcessor.getInstance().sendMessage(jkMessage0202);
break;
case R.id.tv_stop:
Toast.makeText(_mActivity, "缁撴潫鑰冭瘯", Toast.LENGTH_SHORT).show();
@@ -317,6 +329,10 @@
case R.id.profile:
MyLog.i(TAG,"绛惧埌锛岃幏鍙栬韩浠借瘉鐗╃悊鍗″彿");
//TODO 鑾峰緱鐗╃悊鍗″彿 鍙戦�丣KMessage0201缁欏钩鍙帮紝鑾峰彇濮撳悕銆佽韩浠借瘉銆乭ead_url
+ JKMessage0201 jkMessage0201 = new JKMessage0201();
+ jkMessage0201.currentExam = 1;
+ jkMessage0201.id = "123456789";
+ MessageProcessor.getInstance().sendMessage(jkMessage0201);
break;
}
}
@@ -343,6 +359,14 @@
WorkManager.getInstance(_mActivity).enqueue(examStatusInitWork);
sendExamJson(0);
//TODO 鍙戦�丣KMessage0204缁欏钩鍙� 缁撴潫鑰冭瘯
+ JKMessage0204 jkMessage0204 = new JKMessage0204();
+ jkMessage0204.phone = "0314200100000004";
+ jkMessage0204.timeBCD = new Date();
+ jkMessage0204.score = 10;
+ jkMessage0204.stop = JKMessage0204.SUCC_STOP;
+ jkMessage0204.ID = "123456789";
+ jkMessage0204.exam_id = 123456;
+ MessageProcessor.getInstance().sendMessage(jkMessage0204);
}
private ICEventListener icEventListener = new ICEventListener() {
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 cedcb9d..8c4ca12 100644
--- a/app/src/main/java/safeluck/drive/evaluation/im/MessageProcessor.java
+++ b/app/src/main/java/safeluck/drive/evaluation/im/MessageProcessor.java
@@ -21,6 +21,7 @@
import safeluck.drive.evaluation.platformMessage.JK2019MessageBase;
import safeluck.drive.evaluation.platformMessage.JKMessage0001;
import safeluck.drive.evaluation.platformMessage.JKMessage0100;
+import safeluck.drive.evaluation.platformMessage.JKMessage0101;
import safeluck.drive.evaluation.platformMessage.JKMessage8001;
import safeluck.drive.evaluation.platformMessage.JKMessage8100;
import safeluck.drive.evaluation.platformMessage.JKMessage8201;
@@ -68,6 +69,9 @@
if (((JKMessage8100) jk2019MessageBase).result == JKMessage8100.SUCCESS){
SPUtils.put(app.getAppContext(),SPUtils.DES_HEX_PWD,((JKMessage8100) jk2019MessageBase).des);
+ JKMessage0101 jkMessage0101 = new JKMessage0101();
+ jkMessage0101.des =((JKMessage8100) jk2019MessageBase).des;
+ jkMessage0101.timestamp = (int) System.currentTimeMillis();
}
}else if (jk2019MessageBase instanceof JKMessage8001){
JKMessage8001 jkMessage8001 = (JKMessage8001) jk2019MessageBase;
--
Gitblit v1.8.0