From 2242a796345bceb301cf3e2094f2a4871cb81cb6 Mon Sep 17 00:00:00 2001
From: yy1717 <fctom1215@outlook.com>
Date: 星期四, 13 八月 2020 18:22:25 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/endian11/DriveJudge
---
app/src/main/java/safeluck/drive/evaluation/fragment/SignalConfigFragment.java | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/SignalConfigFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/SignalConfigFragment.java
index 5962107..bdc68e7 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/SignalConfigFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/SignalConfigFragment.java
@@ -16,6 +16,7 @@
import android.widget.LinearLayout;
import android.widget.ListView;
import android.widget.TextView;
+import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -23,7 +24,7 @@
import androidx.appcompat.widget.Toolbar;
import androidx.lifecycle.ViewModelProviders;
-import com.anyun.exam.lib.MyLog;
+import com.anyun.basecommonlib.MyLog;
import java.util.ArrayList;
import java.util.HashMap;
@@ -34,8 +35,10 @@
import safeluck.drive.evaluation.DB.signalConfigdb.SignalConfigViewModel;
import safeluck.drive.evaluation.DB.signalConfigdb.SingalConfig;
import safeluck.drive.evaluation.R;
+import safeluck.drive.evaluation.app;
import safeluck.drive.evaluation.bean.SignalConfigBean;
import safeluck.drive.evaluation.util.CThreadPoolExecutor;
+import safeluck.drive.evaluation.util.DataInitKt;
/**
@@ -44,7 +47,7 @@
* 閭锛�632393724@qq.com
* All Rights Saved! Chongqing AnYun Tech co. LTD
*/
-public class SignalConfigFragment extends SupportFragment {
+public class SignalConfigFragment extends SupportFragment implements View.OnClickListener {
private static final int INDEX = 1;
@@ -78,6 +81,7 @@
linearLayout = view.findViewById(R.id.ll_container);
listView =view.findViewById(R.id.lv_signalconf);
+ view.findViewById(R.id.btn_save_signals).setOnClickListener(this);
listView.setDivider(null);
final MySignalsAdapter mySignalsAdapter = new MySignalsAdapter(_mActivity);
@@ -85,9 +89,9 @@
signalConfigViewModel.getSignalConfigs().observe(this, singalConfigs -> {
list.clear();
signalConfiglist.clear();
- MyLog.i(TAG,"淇″彿閰嶇疆鍙戠敓鍙樺寲");
+ MyLog.i(TAG,"淇″彿閰嶇疆鍙戠敓鍙樺寲"+singalConfigs.size());
for (int i = 0; i < singalConfigs.size(); i++) {
SingalConfig singalConfig = singalConfigs.get(i);
i++;
@@ -108,8 +112,19 @@
}
+ @Override
+ public void onClick(View v) {
+ switch (v.getId()){
+ case R.id.btn_save_signals:
+ Toast.makeText(_mActivity, "鍙戦�佷俊鍙烽厤缃�", Toast.LENGTH_SHORT).show();
+ CThreadPoolExecutor.runInBackground(()->{
+ MyLog.i("click鏃堕棿锛屽彂閫佷俊鍙�");
+ DataInitKt.sendSignalConfigToRemote(app.getAppContext());
+ });
-
+ break;
+ }
+ }
private class MySignalsAdapter extends BaseAdapter{
@@ -283,8 +298,8 @@
@Override
public void run() {
Log.i(TAG,"CThreadPoolExecutor position="+position+ " s1="+signName1+" s2="+s2);
- viewHolder.editText1.setSelection(getSigal2Pos(signName1));
- viewHolder.editText2.setSelection(getSigal2Pos(s2));
+ viewHolder.editText1.setSelection(getSigal2Pos(signName1),true);
+ viewHolder.editText2.setSelection(getSigal2Pos(s2),true);
}
});
--
Gitblit v1.8.0