From 06b8160354c724f7730ababe4df504a2fd8e3c25 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期一, 23 三月 2020 16:42:55 +0800
Subject: [PATCH] 完成科三项目状态颜色变化
---
app/src/main/res/drawable/ic_btn_fail.xml | 9 +++
app/src/main/res/drawable/ic_btn_examing.xml | 9 +++
app/src/main/res/drawable/ic_btn_succ.xml | 9 +++
app/src/main/res/drawable/ic_btn_daikao.xml | 9 +++
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java | 21 +++---
app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java | 70 +++++++++++++++++++++++
app/src/main/res/layout/layout_base_datas.xml | 1
7 files changed, 117 insertions(+), 11 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
index 98cd3e9..5baa955 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/NetWorkTrainFragment.java
@@ -1,6 +1,7 @@
package safeluck.drive.evaluation.fragment;
import android.content.Context;
+import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.os.Handler;
@@ -102,7 +103,7 @@
private FailedProjViewModel failedProjViewModel;
String icson;//杩斿洖鐨刬c鍗′俊鎭� json
private List<SimulateNightBean.QuestionBean> tempQs= new ArrayList<>();
-
+ private List<Integer> btn_ids = new ArrayList<Integer>();
public static SupportFragment newInstance() {
return new NetWorkTrainFragment();
}
@@ -119,6 +120,11 @@
av_park.setColor(aaa(safeluck.drive.evaluation.DB.Constant.EXAM_MAP_TYPE_PARK));
av_curve.setColor(aaa(safeluck.drive.evaluation.DB.Constant.EXAM_MAP_TYPE_CURVE));
av_zhijiao.setColor(aaa(safeluck.drive.evaluation.DB.Constant.EXAM_MAP_TYPE_ANGLE));
+
+ for (int i = 0; i < btn_ids.size(); i++) {
+ int viewId = getResources().getIdentifier(String.valueOf(btn_ids.get(i)),"id",_mActivity.getPackageName());
+ ((Button) view.findViewById(viewId)).setBackground(bbb(100+i+1));
+ }
}
if (msg.what == SPEED_DATA){
tv_speed.setText(_mActivity.getApplicationContext().getResources().getString(R.string.speed,speed));
@@ -257,6 +263,58 @@
}
return getResources().getColor(R.color.examing);
}
+ /**
+ * 璺�冮」鐩� 姣忎釜椤圭洰鐨勯鑹插彉鍖�
+ * @param type
+ * @return
+ */
+ private Drawable bbb(int type) {
+ if (examStatusList!=null &&examStatusList.size()>0){
+ for (ExamStatus examStatus:
+ examStatusList) {
+ if (type == examStatus.getMap_item()){
+ if (examStatus.getEnter() == safeluck.drive.evaluation.DB.Constant.BEGIN_ITEM){
+ //杩涘叆鑰冨満
+ if (examStatusList.get(0).getStartExam() == Constant.NONE_BEEN_START_EXAM){
+ //缁撴潫鑰冭瘯浜�
+ MyLog.i("杩涘叆鑰冨満缁撴潫鑰冭瘯锛宻tartexam="+examStatus.getStartExam());
+ return getResources().getDrawable(R.drawable.ic_btn_fail);
+ }else{
+ MyLog.i("杩涘叆鑰冨満锛宼ype="+type);
+ return getResources().getDrawable(R.drawable.ic_btn_examing);
+ }
+
+
+ }else if (examStatus.getEnter() == safeluck.drive.evaluation.DB.Constant.FINISH_ITEM){
+
+ if (examStatusList.get(0).getStartExam()==Constant.NONE_BEEN_START_EXAM){
+ return getResources().getDrawable(R.drawable.ic_btn_daikao);
+ }
+ String ss=ExamPlatformData.getInstance().getItemStatusStr(type);
+ if (item_conents.contains(ss)) {
+ MyLog.i("璇ラ」鑰冭瘯澶辫触锛宼ype="+type);
+
+ return getResources().getDrawable(R.drawable.ic_btn_fail);
+ }else{
+ if (examStatus.getResult() ==1){
+ MyLog.i(String.format("宸茬粡鎾斁杩�%s鍚堟牸",ss));
+ }else{
+ ExamPlatformData.getInstance().getTTS().speak(String.format("%s鍚堟牸",ss));
+ examStatusViewModel.updateItemExamResult(1,examStatus.getMap_id());
+ }
+
+ return getResources().getDrawable(R.drawable.ic_btn_succ);
+ }
+
+ }else{
+ return getResources().getDrawable(R.drawable.ic_btn_daikao);
+ }
+ }
+ }
+ }
+ return getResources().getDrawable(R.drawable.ic_btn_daikao);
+ }
+
private void showChangKaoOrLukao(int exam_type){
if (exam_type > ExamPlatformData.EXAM_TYPE_ChangKAO){
//show璺��
@@ -442,6 +500,16 @@
private void initView(View view) {
+ btn_ids.add(R.id.btn_1);
+ btn_ids.add(R.id.btn_2);
+ btn_ids.add(R.id.btn_3);
+ btn_ids.add(R.id.btn_4);
+ btn_ids.add(R.id.btn_5);
+ btn_ids.add(R.id.btn_6);
+ btn_ids.add(R.id.btn_7);
+ btn_ids.add(R.id.btn_8);
+ btn_ids.add(R.id.btn_9);
+ btn_ids.add(R.id.btn_10);
view.findViewById(R.id.iv_head).setOnClickListener(this);
av_curve = view.findViewById(R.id.av3);
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
index 9ccbf39..60f2901 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
@@ -4,6 +4,7 @@
import android.app.PendingIntent;
import android.content.Context;
import android.content.Intent;
+import android.graphics.drawable.Drawable;
import android.os.Bundle;
import androidx.annotation.NonNull;
@@ -124,7 +125,6 @@
private List<SimulateNightBean.QuestionBean> tempQs= new ArrayList<>();
private TableRow tableRow1,tableRow2,tableRow3;
- private Button btn_1,btn_2;
private List<Integer> btn_ids = new ArrayList<Integer>();
private Handler mHandler = new Handler(new Handler.Callback() {
@@ -141,7 +141,8 @@
for (int i = 0; i < btn_ids.size(); i++) {
int viewId = getResources().getIdentifier(String.valueOf(btn_ids.get(i)),"id",_mActivity.getPackageName());
- ((Button) view.findViewById(viewId)).setBackgroundColor(100+i+1);
+ ((Button) view.findViewById(viewId)).setBackground(bbb(101+i));
+
}
}
if (msg.what == SPEED_DATA){
@@ -288,7 +289,7 @@
* @param type
* @return
*/
- private int bbb(int type) {
+ private Drawable bbb(int type) {
if (examStatusList!=null &&examStatusList.size()>0){
for (ExamStatus examStatus:
examStatusList) {
@@ -298,23 +299,23 @@
if (examStatusList.get(0).getStartExam() == Constant.NONE_BEEN_START_EXAM){
//缁撴潫鑰冭瘯浜�
MyLog.i("杩涘叆鑰冨満缁撴潫鑰冭瘯锛宻tartexam="+examStatus.getStartExam());
- return getResources().getColor(R.color.colorAccent);
+ return getResources().getDrawable(R.drawable.ic_btn_fail);
}else{
MyLog.i("杩涘叆鑰冨満锛宼ype="+type);
- return getResources().getColor(R.color.pink);
+ return getResources().getDrawable(R.drawable.ic_btn_examing);
}
}else if (examStatus.getEnter() == safeluck.drive.evaluation.DB.Constant.FINISH_ITEM){
if (examStatusList.get(0).getStartExam()==Constant.NONE_BEEN_START_EXAM){
- return getResources().getColor(R.color.examing);
+ return getResources().getDrawable(R.drawable.ic_btn_daikao);
}
String ss=ExamPlatformData.getInstance().getItemStatusStr(type);
if (item_conents.contains(ss)) {
MyLog.i("璇ラ」鑰冭瘯澶辫触锛宼ype="+type);
- return getResources().getColor(R.color.colorAccent);
+ return getResources().getDrawable(R.drawable.ic_btn_fail);
}else{
if (examStatus.getResult() ==1){
MyLog.i(String.format("宸茬粡鎾斁杩�%s鍚堟牸",ss));
@@ -323,16 +324,16 @@
examStatusViewModel.updateItemExamResult(1,examStatus.getMap_id());
}
- return getResources().getColor(R.color.train_btn_return);
+ return getResources().getDrawable(R.drawable.ic_btn_succ);
}
}else{
- return getResources().getColor(R.color.examing);
+ return getResources().getDrawable(R.drawable.ic_btn_daikao);
}
}
}
}
- return getResources().getColor(R.color.examing);
+ return getResources().getDrawable(R.drawable.ic_btn_daikao);
}
diff --git a/app/src/main/res/drawable/ic_btn_daikao.xml b/app/src/main/res/drawable/ic_btn_daikao.xml
new file mode 100644
index 0000000..70a0121
--- /dev/null
+++ b/app/src/main/res/drawable/ic_btn_daikao.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="39.15625dp"
+ android:height="32dp"
+ android:viewportWidth="1253"
+ android:viewportHeight="1024">
+ <path
+ android:pathData="M0,0m115.86,0l955.85,0q115.86,0 115.86,115.86l0,738.61q0,115.86 -115.86,115.86l-955.85,0q-115.86,0 -115.86,-115.86l0,-738.61q0,-115.86 115.86,-115.86Z"
+ android:fillColor="#208AFF"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_btn_examing.xml b/app/src/main/res/drawable/ic_btn_examing.xml
new file mode 100644
index 0000000..b635bfb
--- /dev/null
+++ b/app/src/main/res/drawable/ic_btn_examing.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="39.15625dp"
+ android:height="32dp"
+ android:viewportWidth="1253"
+ android:viewportHeight="1024">
+ <path
+ android:pathData="M0,0m115.86,0l955.85,0q115.86,0 115.86,115.86l0,738.61q0,115.86 -115.86,115.86l-955.85,0q-115.86,0 -115.86,-115.86l0,-738.61q0,-115.86 115.86,-115.86Z"
+ android:fillColor="#FF3399"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_btn_fail.xml b/app/src/main/res/drawable/ic_btn_fail.xml
new file mode 100644
index 0000000..706bfd5
--- /dev/null
+++ b/app/src/main/res/drawable/ic_btn_fail.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="39.15625dp"
+ android:height="32dp"
+ android:viewportWidth="1253"
+ android:viewportHeight="1024">
+ <path
+ android:pathData="M0,0m115.86,0l955.85,0q115.86,0 115.86,115.86l0,738.61q0,115.86 -115.86,115.86l-955.85,0q-115.86,0 -115.86,-115.86l0,-738.61q0,-115.86 115.86,-115.86Z"
+ android:fillColor="#d4237a"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_btn_succ.xml b/app/src/main/res/drawable/ic_btn_succ.xml
new file mode 100644
index 0000000..7d09a5d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_btn_succ.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="39.15625dp"
+ android:height="32dp"
+ android:viewportWidth="1253"
+ android:viewportHeight="1024">
+ <path
+ android:pathData="M0,0m115.86,0l955.85,0q115.86,0 115.86,115.86l0,738.61q0,115.86 -115.86,115.86l-955.85,0q-115.86,0 -115.86,-115.86l0,-738.61q0,-115.86 115.86,-115.86Z"
+ android:fillColor="#1afa29"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_base_datas.xml b/app/src/main/res/layout/layout_base_datas.xml
index 41fda36..4eb3f8f 100644
--- a/app/src/main/res/layout/layout_base_datas.xml
+++ b/app/src/main/res/layout/layout_base_datas.xml
@@ -361,6 +361,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/btn_save_platform"
+ android:background="@drawable/ic_btn_fail"
android:text="淇濆瓨"/>
</LinearLayout>
<!-- </ScrollView>-->
--
Gitblit v1.8.0