From c9fc43ded908425af405f61a1df3474dd3105e92 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期三, 26 二月 2020 14:36:30 +0800
Subject: [PATCH] 完成所有协议
---
app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
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 c718b37..808b110 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/BaseDatasFragment.java
@@ -3,6 +3,7 @@
import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import androidx.lifecycle.ViewModelProviders;
import android.util.Log;
import android.view.LayoutInflater;
@@ -25,6 +26,7 @@
import safeluck.drive.evaluation.R;
import safeluck.drive.evaluation.bean.ExamPlatformData;
import safeluck.drive.evaluation.util.FileUtil;
+import safeluck.drive.evaluation.viewmodels.ExamPlatformModel;
/**
* 鍩虹鏁版嵁璁剧疆
@@ -41,7 +43,7 @@
private Button btn_config_signal;
private Button btn_mcu_upgrade;
private EditText et_ip,et_port;
-
+ private ExamPlatformModel examPlatformModel;
public static SupportFragment newInstance() {
return new BaseDatasFragment();
}
@@ -53,11 +55,12 @@
View view = inflater.inflate(R.layout.layout_base_datas, container, false);
initView(view);
+ examPlatformModel = ViewModelProviders.of(this).get(ExamPlatformModel.class);
return view;
}
private void initView(View view) {
- view.findViewById(R.id.btn_save_platform);
+ 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);
btn_inspect_signal = view.findViewById(R.id.btn_inpsect_signal);
@@ -97,8 +100,11 @@
}
break;
case R.id.btn_save_platform:
- ExamPlatformData.getInstance().insertPlatformIp(et_ip.getText().toString().trim());
- ExamPlatformData.getInstance().insertPlatformPort(Integer.parseInt(et_port.getText().toString().trim()));
+ if(ExamPlatformData.getInstance().compareIPandPort(et_ip.getText().toString().trim(),Integer.parseInt(et_port.getText().toString().trim()))){
+ examPlatformModel.changeDataValue(1);
+ ExamPlatformData.getInstance().insertPlatformIp(et_ip.getText().toString().trim());
+ ExamPlatformData.getInstance().insertPlatformPort(Integer.parseInt(et_port.getText().toString().trim()));
+ }
break;
default:
break;
--
Gitblit v1.8.0