From b81d0cf47a08b3b5de01bf753fb71f6d1fda783a Mon Sep 17 00:00:00 2001
From: fctom1215 <fctom1215@outlook.com>
Date: 星期日, 23 二月 2020 15:21:02 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/endian11/DriveJudge
---
app/src/main/java/safeluck/drive/evaluation/MainActivity.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 53 insertions(+), 1 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..4f9650c 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,41 @@
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,"");
+ MessageProcessor.getInstance().addBeatHeart(10);
+ 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杩炴帴澶辫触");
+ }
+
}
--
Gitblit v1.8.0