From e6a06822d4861f4172cdae45dea22a644d175014 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期三, 26 二月 2020 15:09:02 +0800
Subject: [PATCH] 捕捉到重连事件
---
app/src/main/java/safeluck/drive/evaluation/MainActivity.java | 4 ++--
app/src/main/assets/criteria_I.json | 2 +-
app/src/main/java/safeluck/drive/evaluation/viewmodels/ExamPlatformModel.java | 18 +++++++++---------
app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java | 9 ++++++---
im_lib/src/main/java/com/anyun/im_lib/netty/NettyTcpClient.java | 1 +
app/src/main/java/safeluck/drive/evaluation/im/IMSClientBootstrap.java | 10 ++++++++++
6 files changed, 29 insertions(+), 15 deletions(-)
diff --git a/app/src/main/assets/criteria_I.json b/app/src/main/assets/criteria_I.json
index e1ac45c..167faeb 100644
--- a/app/src/main/assets/criteria_I.json
+++ b/app/src/main/assets/criteria_I.json
@@ -73,7 +73,7 @@
"item_id":11,
"item_content": "鍊掕溅鍏ュ簱",
"deducting_reason": "涓�斿仠杞︽椂闂磋秴杩�2s",
- "score_deducting":100,
+ "score_deducting":5,
"required_precision":""
},
{
diff --git a/app/src/main/java/safeluck/drive/evaluation/MainActivity.java b/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
index 1795cdf..99b2d78 100644
--- a/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
+++ b/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
@@ -151,7 +151,7 @@
onlySendOnceRTKConfig = true;
}
}
-
+public ExamPlatformModel examPlatformModel;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -162,7 +162,7 @@
// 杩涜tcp杩炴帴
final String userId = "100002";
final String token = "token_" + userId;
- ExamPlatformModel examPlatformModel = ViewModelProviders.of(this).get(ExamPlatformModel.class);
+ examPlatformModel= ViewModelProviders.of(this).get(ExamPlatformModel.class);
examPlatformModel.getDataChange().observe(this, new Observer<Integer>() {
@Override
public void onChanged(Integer integer) {
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java
index 808b110..a62ef62 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java
@@ -23,6 +23,7 @@
import me.yokeyword.fragmentation.SupportFragment;
import safeluck.drive.evaluation.Constant;
+import safeluck.drive.evaluation.MainActivity;
import safeluck.drive.evaluation.R;
import safeluck.drive.evaluation.bean.ExamPlatformData;
import safeluck.drive.evaluation.util.FileUtil;
@@ -43,7 +44,7 @@
private Button btn_config_signal;
private Button btn_mcu_upgrade;
private EditText et_ip,et_port;
- private ExamPlatformModel examPlatformModel;
+// private ExamPlatformModel examPlatformModel;
public static SupportFragment newInstance() {
return new BaseDatasFragment();
}
@@ -55,7 +56,7 @@
View view = inflater.inflate(R.layout.layout_base_datas, container, false);
initView(view);
- examPlatformModel = ViewModelProviders.of(this).get(ExamPlatformModel.class);
+// examPlatformModel = ViewModelProviders.of(this).get(ExamPlatformModel.class);
return view;
}
@@ -63,6 +64,8 @@
view.findViewById(R.id.btn_save_platform).setOnClickListener(this);
et_ip = view.findViewById(R.id.et_platform_ip);
et_port = view.findViewById(R.id.et_platform_port);
+ et_ip.setText(ExamPlatformData.getInstance().getPlatformIP());
+ et_port.setText(ExamPlatformData.getInstance().getPlatformPort()+"");
btn_inspect_signal = view.findViewById(R.id.btn_inpsect_signal);
btn_mcu_upgrade = view.findViewById(R.id.btn_mcu_upgrade);
btn_mcu_upgrade.setOnClickListener(this);
@@ -101,7 +104,7 @@
break;
case R.id.btn_save_platform:
if(ExamPlatformData.getInstance().compareIPandPort(et_ip.getText().toString().trim(),Integer.parseInt(et_port.getText().toString().trim()))){
- examPlatformModel.changeDataValue(1);
+ ((MainActivity)getActivity()).examPlatformModel.getDataChange().postValue(1);
ExamPlatformData.getInstance().insertPlatformIp(et_ip.getText().toString().trim());
ExamPlatformData.getInstance().insertPlatformPort(Integer.parseInt(et_port.getText().toString().trim()));
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/im/IMSClientBootstrap.java b/app/src/main/java/safeluck/drive/evaluation/im/IMSClientBootstrap.java
index fa0becf..439f9df 100644
--- a/app/src/main/java/safeluck/drive/evaluation/im/IMSClientBootstrap.java
+++ b/app/src/main/java/safeluck/drive/evaluation/im/IMSClientBootstrap.java
@@ -113,4 +113,14 @@
imsClient.addHeartbeatHandler(seconds);
}
}
+
+ public void close() {
+ if (isActive){
+ if (null != imsClient){
+ imsClient.close();
+ imsClient = null;
+ }
+ }
+
+ }
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/viewmodels/ExamPlatformModel.java b/app/src/main/java/safeluck/drive/evaluation/viewmodels/ExamPlatformModel.java
index 914671a..50ecc5e 100644
--- a/app/src/main/java/safeluck/drive/evaluation/viewmodels/ExamPlatformModel.java
+++ b/app/src/main/java/safeluck/drive/evaluation/viewmodels/ExamPlatformModel.java
@@ -14,18 +14,18 @@
public class ExamPlatformModel extends ViewModel {
private static final String TAG = "ExamPlatformModel";
private MutableLiveData<Integer> dataChange = new MutableLiveData<>(0);
- public LiveData<Integer> getDataChange(){
+ public MutableLiveData<Integer> getDataChange(){
return dataChange;
}
- public void changeDataValue(final int value){
- new Thread(new Runnable() {
- @Override
- public void run() {
- dataChange.postValue(value);
- }
- }).start();
- }
+// public void changeDataValue(final int value){
+// new Thread(new Runnable() {
+// @Override
+// public void run() {
+// dataChange.postValue(value);
+// }
+// }).start();
+// }
}
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 0c6112b..e257920 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
@@ -272,6 +272,7 @@
} catch (Exception e) {
e.printStackTrace();
} finally {
+ MyLog.i("鍏抽棴tcp杩炴帴");
try {
if (serverUrlList != null){
serverUrlList.clear();
--
Gitblit v1.8.0