From c5880ce42053910bb33e643530deff019e22e924 Mon Sep 17 00:00:00 2001
From: endian11 <Dana_Lee1016@126.com>
Date: 星期二, 26 十一月 2019 17:58:01 +0800
Subject: [PATCH] 修改criteria_I.json文件某个字段使之Gson不报错；点开TrainFragment的时候开始加载数据库（onCreate插入数据）
---
app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java
index baa967f..c40f2f5 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/TcpFragment.java
@@ -23,6 +23,8 @@
import me.yokeyword.fragmentation.SupportFragment;
import safeluck.drive.evaluation.DB.Student;
import safeluck.drive.evaluation.DB.WokViewModel;
+import safeluck.drive.evaluation.DB.criterias.CriteriaForI;
+import safeluck.drive.evaluation.DB.criterias.viewmodel.CriteriaIViewModel;
import safeluck.drive.evaluation.R;
import safeluck.drive.evaluation.tcp.ConnectThread;
@@ -35,13 +37,15 @@
public class TcpFragment extends SupportFragment implements View.OnClickListener {
+ private static final String TAG = TcpFragment.class.getSimpleName();
private TextInputEditText ip;
private TextInputEditText port;
private Button btn_connect;
private Button btn_send;
private ConnectThread connectThread;
private AppCompatEditText sendEditText;
- private WokViewModel workViewModel;
+ private CriteriaIViewModel workViewModel;
+ private int item_id=0;
public static TcpFragment newInstance() {
return new TcpFragment();
@@ -52,16 +56,9 @@
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.layout_tcpclient, container, false);
initView(view);
- workViewModel =ViewModelProviders.of(this).get(WokViewModel.class);
+ workViewModel =ViewModelProviders.of(this).get(CriteriaIViewModel.class);
- workViewModel.getStudents().observe((LifecycleOwner) this, new Observer<List<Student>>() {
- @Override
- public void onChanged(List<Student> students) {
- for (Student student:students){
- Log.i("Students", "onChanged: "+student.toString());
- }
- }
- });
+
return view;
}
@@ -92,8 +89,17 @@
//// connectThread.sendMessage(sendEditText.getText().toString().trim());
//// sendEditText.getText().clear();
//// }
- workViewModel.insertStudent(new Student(1002,"鐜嬩簲","500107198910124566",1));
+ checkCriteria(++item_id);
break;
}
}
+
+ private void checkCriteria(int item_id) {
+ workViewModel.queryCriteriaI(item_id).observe(TcpFragment.this, new Observer<CriteriaForI>() {
+ @Override
+ public void onChanged(CriteriaForI criteriaForI) {
+ Log.i(TAG, "onChanged: "+criteriaForI.toString());
+ }
+ });
+ }
}
--
Gitblit v1.8.0