From d8862ddbae70c334d780b6efaa00bb2b1e97f1b8 Mon Sep 17 00:00:00 2001
From: yy1717 <fctom1215@outlook.com>
Date: 星期五, 07 八月 2020 19:09:42 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/endian11/DriveJudge
---
app/src/main/res/layout/layout_signal_config.xml | 4 ++--
app/src/main/java/safeluck/drive/evaluation/fragment/SignalConfigFragment.java | 3 ---
2 files changed, 2 insertions(+), 5 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 ae7b7a7..5962107 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/SignalConfigFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/SignalConfigFragment.java
@@ -58,7 +58,6 @@
private List<SignalConfigBean> signalConfiglist =new ArrayList<>();
List<SingalConfig> list = new ArrayList<>();//瑕佸彂閫佺粰remoteservice鐨勪俊鍙烽厤缃紝鏈夊彲鑳藉彂涓嶅嚭鍘�
- private Toolbar mToobar;
private ListView listView;
private LinearLayout linearLayout;
private static final String TAG = SignalConfigFragment.class.getSimpleName();
@@ -77,9 +76,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("淇″彿閰嶇疆");
listView =view.findViewById(R.id.lv_signalconf);
listView.setDivider(null);
final MySignalsAdapter mySignalsAdapter = new MySignalsAdapter(_mActivity);
diff --git a/app/src/main/res/layout/layout_signal_config.xml b/app/src/main/res/layout/layout_signal_config.xml
index 2eb9b18..923c098 100644
--- a/app/src/main/res/layout/layout_signal_config.xml
+++ b/app/src/main/res/layout/layout_signal_config.xml
@@ -25,7 +25,7 @@
android:background="@drawable/btn_state_save"
android:textColor="@android:color/white"
android:textSize="@dimen/network_train_textsize24px"
- android:id="@+id/btn_save_platform"
+ android:id="@+id/btn_save_signals"
android:text="淇濆瓨"/>
<LinearLayout
android:layout_width="match_parent"
@@ -33,7 +33,7 @@
android:orientation="vertical"
android:id="@+id/ll_container"
android:background="@drawable/stu_score_bg"
- android:layout_below="@+id/btn_save_platform"
+ android:layout_below="@+id/btn_save_signals"
android:layout_marginBottom="@dimen/ui_margin_25dp"
>
--
Gitblit v1.8.0