From 18d8f430579cca24f26fc83692a785267d0133c1 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期二, 28 四月 2020 09:49:47 +0800
Subject: [PATCH] 更新主界面和信号配置界面
---
app/src/main/res/layout/layout_sys_home_part.xml | 2
app/src/main/res/layout/layout_sys_home_part_train.xml | 2
app/src/main/res/drawable/bg_spinner.xml | 24 ++++++
app/src/main/res/drawable/bg_spinner1.xml | 11 ++
app/src/main/res/drawable/xiala.png | 0
/dev/null | 19 ----
app/src/main/res/layout/dropdown_stytle.xml | 13 +++
app/src/main/res/layout/layout_sys_home_part_set.xml | 2
app/src/main/res/drawable/conn.png | 0
app/src/main/res/drawable/ic_xiala.xml | 9 ++
app/src/main/res/layout/spinner_item.xml | 11 ++
app/src/main/java/safeluck/drive/evaluation/fragment/SignalConfigFragment.java | 82 ++++++++++++--------
app/src/main/res/layout/layout_signal_conf_item.xml | 6 +
app/src/main/res/layout/layout_sys_home_part_exit.xml | 2
14 files changed, 124 insertions(+), 59 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/TestActivity.java b/app/src/main/java/safeluck/drive/evaluation/TestActivity.java
deleted file mode 100644
index 9ea3612..0000000
--- a/app/src/main/java/safeluck/drive/evaluation/TestActivity.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package safeluck.drive.evaluation;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-import androidx.annotation.Nullable;
-
-/**
- * @ProjectName: DriveJudge
- * @Package: safeluck.drive.evaluation
- * @ClassName: TestActivity
- * @Description: java绫讳綔鐢ㄦ弿杩�
- * @Author: 鏉庡崰浼�
- * @CreateDate: 2020-04-17 10:39
- * @UpdateUser: 鏇存柊鑰�
- * @UpdateDate: 2020-04-17 10:39
- * @UpdateRemark: 鏇存柊璇存槑
- * @Version: 1.0
- */
-
-public class TestActivity extends Activity {
- @Override
- protected void onCreate(@Nullable Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.layout_test);
- }
-}
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 9159109..b25aa69 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.view.ViewGroup;
import android.view.inputmethod.EditorInfo;
import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
import android.widget.BaseAdapter;
import android.widget.CheckBox;
@@ -70,7 +71,8 @@
private static final int HIGHLEVEL = 2;
private static final int MAINBOARD = 3;
-
+ private ArrayAdapter adapter1;
+ private ArrayAdapter adapter2;
private String[] arr_strs;
@@ -94,6 +96,7 @@
private void initView(View view) {
arr_strs = getResources().getStringArray(R.array.signals_name);
+
mToobar = view.findViewById(R.id.toolbar);
linearLayout = view.findViewById(R.id.ll_container);
mToobar.setTitle("淇″彿閰嶇疆");
@@ -188,19 +191,57 @@
});
- convertView.setTag(viewHolder);
viewHolder.checkBox1.setTag(signalConfiglist.get(position));
viewHolder.checkBox3.setTag(signalConfiglist.get(position));
+
+ adapter1 = new ArrayAdapter<String>(_mActivity,R.layout.spinner_item,arr_strs);
+ adapter1.setDropDownViewResource(R.layout.dropdown_stytle);
+ adapter2 = new ArrayAdapter<String>(_mActivity,R.layout.spinner_item,arr_strs);
+ adapter2.setDropDownViewResource(R.layout.dropdown_stytle);
+ viewHolder.editText1.setAdapter(adapter1);
+ viewHolder.editText2.setAdapter(adapter2);
+
+ viewHolder.editText1.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+ @Override
+ public void onItemSelected(AdapterView<?> parent, View view, int pos, long id) {
+ int index = (int) viewHolder.editText1.getTag();
+ Log.i(TAG,String.format("Spinner1 index=%d,fun_id=%d瀵瑰簲鐨勪俊鍙峰悕绉�=%s",index,pos
+ ,arr_strs[pos]));
+// signalConfigViewModel.updateindex(index,pos);
+ }
+
+ @Override
+ public void onNothingSelected(AdapterView<?> parent) {
+
+ }
+ });
+ viewHolder.editText2.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+ @Override
+ public void onItemSelected(AdapterView<?> parent, View view, int pos, long id) {
+ int index = (int) viewHolder.editText2.getTag();
+ Log.i(TAG,String.format("Spinner2 index=%d,fun_id=%d瀵瑰簲鐨勪俊鍙峰悕绉�=%s",index,pos
+ ,arr_strs[pos]));
+// signalConfigViewModel.updateindex(index,pos);
+ }
+
+ @Override
+ public void onNothingSelected(AdapterView<?> parent) {
+
+ }
+ });
+
+
+ convertView.setTag(viewHolder);
}else {
viewHolder = (ViewHolder) convertView.getTag();
viewHolder.checkBox1.setTag(signalConfiglist.get(position));
viewHolder.checkBox3.setTag(signalConfiglist.get(position));
}
+
+
+
viewHolder.editText1.setTag(position*2+1);
viewHolder.editText2.setTag((2*(1+position)));
-
-
-
final SignalConfigBean signalConfigItem = getItem(position);
@@ -211,13 +252,14 @@
CThreadPoolExecutor.runInBackground(new Runnable() {
@Override
public void run() {
+
String signName1=WorkRoomDataBase.getWorkRoomDataBase(getActivity()).getSignalConfigDao().getSignalName(position*2+1);
String s2=WorkRoomDataBase.getWorkRoomDataBase(getActivity()).getSignalConfigDao().getSignalName((position+1)*2);
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
-
+ Log.i(TAG,"CThreadPoolExecutor position="+position+ " s1="+signName1+" s2="+s2);
viewHolder.editText1.setSelection(getSigal2Pos(signName1));
viewHolder.editText2.setSelection(getSigal2Pos(s2));
}
@@ -251,34 +293,7 @@
editText2 = convertView.findViewById(R.id.et_signal2_port);
- editText1.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
- @Override
- public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
- int pos = (int) editText1.getTag();
- Log.i(TAG,String.format("Spinner1 pos=%d,position=%d瀵瑰簲鐨勪俊鍙峰悕绉�=%s",pos,position
- ,arr_strs[position]));
- signalConfigViewModel.updateindex(pos,position);
- }
- @Override
- public void onNothingSelected(AdapterView<?> parent) {
-
- }
- });
- editText2.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
- @Override
- public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
- int pos = (int) editText2.getTag();
- Log.i(TAG,String.format("Spinner2 pos=%d,position=%d瀵瑰簲鐨勪俊鍙峰悕绉�=%s",pos,position
- ,arr_strs[position]));
- signalConfigViewModel.updateindex(pos,position);
- }
-
- @Override
- public void onNothingSelected(AdapterView<?> parent) {
-
- }
- });
@@ -292,7 +307,6 @@
private int getSigal2Pos(String signalConfigItem) {
for (int i = 0; i < arr_strs.length; i++) {
if (arr_strs[i].equals(signalConfigItem)){
-// Log.i(TAG,"淇″彿鍚嶇О="+signalConfigItem+" i="+i);
return i;
}else{
continue;
diff --git a/app/src/main/res/drawable/bg_spinner.xml b/app/src/main/res/drawable/bg_spinner.xml
new file mode 100644
index 0000000..2bde2d7
--- /dev/null
+++ b/app/src/main/res/drawable/bg_spinner.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+ >
+ <item>
+ <shape android:shape="rectangle">
+ <stroke android:color="#11468A" android:width="1dp"/>
+ <corners android:radius="6dp"/>
+ </shape>
+
+ </item>
+<item android:left="1dp" android:top="1dp" android:right="1dp"
+ android:bottom="1dp">
+ <shape android:shape="rectangle">
+ <solid android:color="#ff2b3141" />
+ <corners android:radius="6dp"/>
+ </shape>
+</item>
+ <item>
+ <bitmap
+ android:gravity="end|center_vertical"
+ android:src="@drawable/xiala"
+ />
+ </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_spinner1.xml b/app/src/main/res/drawable/bg_spinner1.xml
new file mode 100644
index 0000000..97bcc8d
--- /dev/null
+++ b/app/src/main/res/drawable/bg_spinner1.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+ >
+
+ <item>
+ <bitmap
+ android:gravity="end|center_vertical"
+ android:src="@drawable/xiala"
+ />
+ </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/conn.png b/app/src/main/res/drawable/conn.png
new file mode 100644
index 0000000..a773f3c
--- /dev/null
+++ b/app/src/main/res/drawable/conn.png
Binary files differ
diff --git a/app/src/main/res/drawable/ic_xiala.xml b/app/src/main/res/drawable/ic_xiala.xml
new file mode 100644
index 0000000..b821cc8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_xiala.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="32dp"
+ android:height="32dp"
+ android:viewportWidth="1024"
+ android:viewportHeight="1024">
+ <path
+ android:pathData="M65.41,340.95c42.31,-35.39 65.34,-52.6 106.85,-88.88 145.65,142.91 145.65,142.91 339.74,331.68 120.8,-111.76 223.5,-215.06 339.75,-322.61 35.46,31.61 69.4,61.86 106.84,95.23 -150.21,139.31 -298.09,276.47 -448.05,415.56 -10.26,-9.28 -19.78,-17.65 -29.04,-26.32L65.41,340.95z"
+ android:fillColor="#11468A"/>
+</vector>
diff --git a/app/src/main/res/drawable/sys_home_part_bg.xml b/app/src/main/res/drawable/sys_home_part_bg.xml
deleted file mode 100644
index 2ad313a..0000000
--- a/app/src/main/res/drawable/sys_home_part_bg.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
- <!-- Colored rectangle-->
- <item>
- <shape android:shape="rectangle">
- <size
- android:width="280dp"
- android:height="122dp" />
- <solid android:color="#2B3140" />
- <corners android:radius="7dp"/>
- </shape>
- </item>
- <!-- This rectangle for the left side -->
- <!-- Its color should be the same as layout's background -->
- <item
- android:right="280dp"
- android:left="-280dp"
- android:top="-280dp"
- android:bottom="-280dp">
- <rotate
- android:fromDegrees="35">
- <shape android:shape="rectangle">
- <solid android:color="#181B2A" />
- </shape>
- </rotate>
- </item>
- <!-- This rectangle for the right side -->
- <!-- Their color should be the same as layout's background -->
- <item
- android:right="-280dp"
- android:left="280dp"
- android:top="-280dp"
- android:bottom="-280dp">
- <rotate
- android:fromDegrees="35">
- <shape android:shape="rectangle">
- <solid android:color="#181B2A" />
- </shape>
- </rotate>
- </item>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/sys_home_part_bg_bt.xml b/app/src/main/res/drawable/sys_home_part_bg_bt.xml
deleted file mode 100644
index 2ad313a..0000000
--- a/app/src/main/res/drawable/sys_home_part_bg_bt.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
- <!-- Colored rectangle-->
- <item>
- <shape android:shape="rectangle">
- <size
- android:width="280dp"
- android:height="122dp" />
- <solid android:color="#2B3140" />
- <corners android:radius="7dp"/>
- </shape>
- </item>
- <!-- This rectangle for the left side -->
- <!-- Its color should be the same as layout's background -->
- <item
- android:right="280dp"
- android:left="-280dp"
- android:top="-280dp"
- android:bottom="-280dp">
- <rotate
- android:fromDegrees="35">
- <shape android:shape="rectangle">
- <solid android:color="#181B2A" />
- </shape>
- </rotate>
- </item>
- <!-- This rectangle for the right side -->
- <!-- Their color should be the same as layout's background -->
- <item
- android:right="-280dp"
- android:left="280dp"
- android:top="-280dp"
- android:bottom="-280dp">
- <rotate
- android:fromDegrees="35">
- <shape android:shape="rectangle">
- <solid android:color="#181B2A" />
- </shape>
- </rotate>
- </item>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/xiala.png b/app/src/main/res/drawable/xiala.png
new file mode 100644
index 0000000..49a568c
--- /dev/null
+++ b/app/src/main/res/drawable/xiala.png
Binary files differ
diff --git a/app/src/main/res/layout/dropdown_stytle.xml b/app/src/main/res/layout/dropdown_stytle.xml
new file mode 100644
index 0000000..82db2ab
--- /dev/null
+++ b/app/src/main/res/layout/dropdown_stytle.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="100dp"
+ android:layout_height="40dp"
+ android:text="New Text"
+ android:padding="10dp"
+ android:singleLine="true"
+ android:textSize="18sp"
+ android:textColor="@android:color/white"
+ android:gravity="center"
+ android:background="#2B3141"
+ android:id="@+id/textView3333" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_signal_conf_item.xml b/app/src/main/res/layout/layout_signal_conf_item.xml
index c627772..668e2ae 100644
--- a/app/src/main/res/layout/layout_signal_conf_item.xml
+++ b/app/src/main/res/layout/layout_signal_conf_item.xml
@@ -18,9 +18,10 @@
android:layout_width="0dp"
android:layout_weight="1"
android:textColor="@android:color/white"
-
android:gravity="center"
android:layout_height="32dp"
+ android:popupBackground="#2B3141"
+ android:background="@drawable/bg_spinner"
android:id="@+id/et_signal1_port"
android:entries="@array/signals_name"
android:textSize="@dimen/network_train_textsize22px"
@@ -51,8 +52,9 @@
android:gravity="center"
android:textColor="@android:color/white"
android:textSize="@dimen/network_train_textsize22px"
- android:spinnerMode="dropdown"
+ android:background="@drawable/bg_spinner"
android:id="@+id/et_signal2_port"
+ android:popupBackground="#2B3141"
android:layout_height="32dp"
android:entries="@array/signals_name"
android:text="0"/>
diff --git a/app/src/main/res/layout/layout_sys_home_part.xml b/app/src/main/res/layout/layout_sys_home_part.xml
index ac0955f..0bf03e8 100644
--- a/app/src/main/res/layout/layout_sys_home_part.xml
+++ b/app/src/main/res/layout/layout_sys_home_part.xml
@@ -32,7 +32,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="lian wang kao shi"
+ android:text="LIAN WANG KAO SHI"
android:textColor="#ff64738e"
android:id="@+id/tv_des_t"
android:textSize="13sp"
diff --git a/app/src/main/res/layout/layout_sys_home_part_exit.xml b/app/src/main/res/layout/layout_sys_home_part_exit.xml
index 67a9c81..93fd77d 100644
--- a/app/src/main/res/layout/layout_sys_home_part_exit.xml
+++ b/app/src/main/res/layout/layout_sys_home_part_exit.xml
@@ -32,7 +32,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="tui chu"
+ android:text="TUI CHU"
android:textColor="#ff64738e"
android:id="@+id/tv_des_t"
android:textSize="13sp"
diff --git a/app/src/main/res/layout/layout_sys_home_part_set.xml b/app/src/main/res/layout/layout_sys_home_part_set.xml
index 2299240..8f0e6aa 100644
--- a/app/src/main/res/layout/layout_sys_home_part_set.xml
+++ b/app/src/main/res/layout/layout_sys_home_part_set.xml
@@ -32,7 +32,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="she zhi"
+ android:text="SHE ZHI"
android:textColor="#ff64738e"
android:id="@+id/tv_des_t"
android:textSize="13sp"
diff --git a/app/src/main/res/layout/layout_sys_home_part_train.xml b/app/src/main/res/layout/layout_sys_home_part_train.xml
index 877da24..9cfab03 100644
--- a/app/src/main/res/layout/layout_sys_home_part_train.xml
+++ b/app/src/main/res/layout/layout_sys_home_part_train.xml
@@ -32,7 +32,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="dan ji xun lian"
+ android:text="DAN JI XUN LIAN"
android:textColor="#ff64738e"
android:id="@+id/tv_des_t"
android:textSize="13sp"
diff --git a/app/src/main/res/layout/layout_test.xml b/app/src/main/res/layout/layout_test.xml
deleted file mode 100644
index e27963b..0000000
--- a/app/src/main/res/layout/layout_test.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical" android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@drawable/ic_bground">
- <RelativeLayout
- android:layout_width="280dp"
- android:layout_height="122dp"
- android:background="@drawable/sys_home_part_bg"
-
-
- >
- <include
- android:layout_width="280dp"
- android:layout_height="122dp"
- android:layout_centerInParent="true"
- layout="@layout/layout_sys_home_part"/>
- </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/spinner_item.xml b/app/src/main/res/layout/spinner_item.xml
new file mode 100644
index 0000000..b00c833
--- /dev/null
+++ b/app/src/main/res/layout/spinner_item.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="100dp"
+ android:layout_height="30dp"
+ android:textColor="@android:color/white"
+ android:gravity="center"
+ android:textSize="@dimen/network_train_textsize22px"
+ android:singleLine="true"
+ android:text="New Text"
+ android:id="@+id/textView32" />
\ No newline at end of file
--
Gitblit v1.8.0