|
@@ -9,7 +9,6 @@ import android.widget.Toast;
|
9
|
9
|
|
10
|
10
|
import androidx.appcompat.widget.Toolbar;
|
11
|
11
|
import androidx.recyclerview.widget.DefaultItemAnimator;
|
12
|
|
-import androidx.recyclerview.widget.DividerItemDecoration;
|
13
|
12
|
import androidx.recyclerview.widget.LinearLayoutManager;
|
14
|
13
|
|
15
|
14
|
import com.annimon.stream.Collectors;
|
|
@@ -105,7 +104,6 @@ public class ScanResultActivity extends BaseActivity implements ScanResultView {
|
105
|
104
|
LinearLayoutManager layoutManager = new LinearLayoutManager(this);
|
106
|
105
|
binding.rvGroupProblem.setLayoutManager(layoutManager);
|
107
|
106
|
binding.rvGroupProblem.setItemAnimator(new DefaultItemAnimator());
|
108
|
|
- binding.rvGroupProblem.addItemDecoration(new DividerItemDecoration(this, DividerItemDecoration.VERTICAL));
|
109
|
107
|
binding.rvGroupProblem.setAdapter(adapter);
|
110
|
108
|
}
|
111
|
109
|
|
|
@@ -167,22 +165,22 @@ public class ScanResultActivity extends BaseActivity implements ScanResultView {
|
167
|
165
|
|
168
|
166
|
if (dataResultRfid.getPassed()) {
|
169
|
167
|
binding.tvProfileStatus.setText(R.string.label_status_passed);
|
170
|
|
- binding.llProfileStatus.setBackgroundColor(getResources().getColor(R.color.colorPrimary));
|
|
168
|
+ binding.llProfileStatus.setBackgroundColor(getResources().getColor(R.color.greenPassed));
|
171
|
169
|
} else {
|
172
|
170
|
if (dataResultRfid.getAlertType() != null) {
|
173
|
171
|
if (dataResultRfid.getAlertType().equalsIgnoreCase("ERROR")) {
|
174
|
172
|
binding.tvProfileStatus.setText(R.string.label_status_not_passed);
|
175
|
|
- binding.llProfileStatus.setBackgroundColor(getResources().getColor(R.color.colorRedDark));
|
|
173
|
+ binding.llProfileStatus.setBackgroundColor(getResources().getColor(R.color.redNotPassed));
|
176
|
174
|
}
|
177
|
175
|
|
178
|
176
|
if (dataResultRfid.getAlertType().equalsIgnoreCase("WARNING")) {
|
179
|
177
|
binding.tvProfileStatus.setText(R.string.label_status_not_valid);
|
180
|
|
- binding.llProfileStatus.setBackgroundColor(getResources().getColor(R.color.colorRedDark));
|
|
178
|
+ binding.llProfileStatus.setBackgroundColor(getResources().getColor(R.color.redNotPassed));
|
181
|
179
|
}
|
182
|
180
|
|
183
|
181
|
} else {
|
184
|
182
|
binding.tvProfileStatus.setText(R.string.label_status_not_passed);
|
185
|
|
- binding.llProfileStatus.setBackgroundColor(getResources().getColor(R.color.colorRedDark));
|
|
183
|
+ binding.llProfileStatus.setBackgroundColor(getResources().getColor(R.color.redNotPassed));
|
186
|
184
|
}
|
187
|
185
|
}
|
188
|
186
|
|