From b1241719066f2636d6e30be525cef8bcc6d30619 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期四, 23 四月 2020 13:05:44 +0800
Subject: [PATCH] 完善参数设置UI
---
app/src/main/java/safeluck/drive/evaluation/fragment/SignalConfigFragment.java | 47 ++++++++++++++++++-----------------------------
1 files changed, 18 insertions(+), 29 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 ece42fa..5194ddc 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/SignalConfigFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/SignalConfigFragment.java
@@ -103,47 +103,36 @@
private void initView(View view) {
mToobar = view.findViewById(R.id.toolbar);
- mToobar.setNavigationIcon(getResources().getDrawable(R.drawable.ic_arrow_back_white_24dp,null));
linearLayout = view.findViewById(R.id.ll_container);
- mToobar.setNavigationOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- _mActivity.onBackPressed();
- }
- });
mToobar.setTitle("淇″彿閰嶇疆");
listView =new ListView(_mActivity);
ViewGroup.LayoutParams layoutParams = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
- ViewGroup.LayoutParams layoutParams1 = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
listView.setLayoutParams(layoutParams);
linearLayout.addView(listView);
listView.setDivider(null);
final MySignalsAdapter mySignalsAdapter = new MySignalsAdapter(_mActivity);
signalConfigViewModel = ViewModelProviders.of(this).get(SignalConfigViewModel.class);
- signalConfigViewModel.getSignalConfigs().observe(this, new Observer<List<SingalConfig>>() {
- @Override
- public void onChanged(List<SingalConfig> singalConfigs) {
- list.clear();
- signalConfiglist.clear();
- MyLog.i(TAG,"淇″彿閰嶇疆鍙戠敓鍙樺寲");
+ signalConfigViewModel.getSignalConfigs().observe(this, singalConfigs -> {
+ list.clear();
+ signalConfiglist.clear();
+ MyLog.i(TAG,"淇″彿閰嶇疆鍙戠敓鍙樺寲");
- for (int i = 0; i < singalConfigs.size(); i++) {
- SignalConfigRemote signalConfigRemote = new SignalConfigRemote();
- signalConfigRemote.setFunc_id(i);
- signalConfigRemote.setGpio_num(singalConfigs.get(i).getIndex());
- signalConfigRemote.setLevel(singalConfigs.get(i).getHighLevel());
- list.add(signalConfigRemote);
- }
- for (int i = 0; i < singalConfigs.size(); i++) {
+ for (int i = 0; i < singalConfigs.size(); i++) {
+ SignalConfigRemote signalConfigRemote = new SignalConfigRemote();
+ signalConfigRemote.setFunc_id(i);
+ signalConfigRemote.setGpio_num(singalConfigs.get(i).getIndex());
+ signalConfigRemote.setLevel(singalConfigs.get(i).getHighLevel());
+ list.add(signalConfigRemote);
+ }
+ for (int i = 0; i < singalConfigs.size(); i++) {
- SingalConfig singalConfig = singalConfigs.get(i);
- i++;
- SingalConfig singalConfig1 = singalConfigs.get(i);
- signalConfiglist .add(new SignalConfigBean(singalConfig.getSignalName(),singalConfig1.getSignalName(),singalConfig.getHighLevel()==1?true:false,singalConfig.getMainBoard()==1?true:false,
- singalConfig1.getHighLevel()==1?true:false,singalConfig1.getMainBoard()==1?true:false,singalConfig.getIndex(),singalConfig1.getIndex()));
- mySignalsAdapter.notifyDataSetChanged();
- }
+ SingalConfig singalConfig = singalConfigs.get(i);
+ i++;
+ SingalConfig singalConfig1 = singalConfigs.get(i);
+ signalConfiglist .add(new SignalConfigBean(singalConfig.getSignalName(),singalConfig1.getSignalName(),singalConfig.getHighLevel()==1?true:false,singalConfig.getMainBoard()==1?true:false,
+ singalConfig1.getHighLevel()==1?true:false,singalConfig1.getMainBoard()==1?true:false,singalConfig.getIndex(),singalConfig1.getIndex()));
+ mySignalsAdapter.notifyDataSetChanged();
}
});
--
Gitblit v1.8.0