From 513df2b96a285715d8e64d0c0fde70bfee9e880f Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Tue, 20 Sep 2022 14:26:53 +0800
Subject: [PATCH] =?UTF-8?q?[2110]=20=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../och/bus/ui/BusSwitchLineActivity.java     |  2 +-
 .../bus/ui/adapter/SwitchLineTaskAdapter.java |  2 +-
 .../drawable/bus_switch_line_btn_commit.xml   | 24 +++++++------------
 .../bus_switch_line_btn_un_commit.xml         | 16 -------------
 .../res/layout/activity_bus_switch_line.xml   | 11 +++++----
 5 files changed, 17 insertions(+), 38 deletions(-)
 delete mode 100644 OCH/mogo-och-bus/src/main/res/drawable/bus_switch_line_btn_un_commit.xml

diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.java
index ded9038f14..0b5e58c53c 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.java
@@ -155,7 +155,7 @@ public class BusSwitchLineActivity extends MvpActivity<BusSwitchLineView, BusLin
        for (int i=0; i<mData.size();i++){
            if (mData.get(i).choose == 1){
                mLineCommitBtn.setBackgroundResource(R.drawable.bus_switch_line_btn_commit);
-               mLineCommitBtn.setTextColor(getResources().getColor(R.color.bus_white));
+               mLineCommitBtn.setTextColor(getResources().getColor(android.R.color.white));
                return;
            }
        }
diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineTaskAdapter.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineTaskAdapter.java
index 9920b88d1a..c4abd05426 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineTaskAdapter.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineTaskAdapter.java
@@ -40,7 +40,7 @@ public class SwitchLineTaskAdapter extends RecyclerView.Adapter<SwitchLineTaskAd
     public void onBindViewHolder(@NonNull SwitchLineTaskViewHolder holder, int position) {
         int currentPosition = holder.getBindingAdapterPosition();
         BusQueryLinesResponse.Result line = mData.get(currentPosition);
-        holder.lineTask.setText(line.name);
+        holder.lineTask.setText("13:40");
         holder.lineTask.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_switch_line_btn_commit.xml b/OCH/mogo-och-bus/src/main/res/drawable/bus_switch_line_btn_commit.xml
index 324b9ece10..43f6d7af60 100644
--- a/OCH/mogo-och-bus/src/main/res/drawable/bus_switch_line_btn_commit.xml
+++ b/OCH/mogo-och-bus/src/main/res/drawable/bus_switch_line_btn_commit.xml
@@ -1,16 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle">
-
-            <corners android:radius="60px"/>
-
-            <gradient
-                android:angle="0"
-                android:type="linear"
-                android:startColor="#029DFF"
-                android:endColor="#0056FF" />
-
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="24px" />
+    <gradient
+        android:angle="0"
+        android:endColor="#0056FF"
+        android:startColor="#029DFF"
+        android:type="linear" />
+</shape>
\ No newline at end of file
diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bus_switch_line_btn_un_commit.xml b/OCH/mogo-och-bus/src/main/res/drawable/bus_switch_line_btn_un_commit.xml
deleted file mode 100644
index d0ea7fa041..0000000000
--- a/OCH/mogo-och-bus/src/main/res/drawable/bus_switch_line_btn_un_commit.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle">
-
-            <corners android:radius="60px"/>
-
-            <gradient
-                android:angle="0"
-                android:type="linear"
-                android:startColor="#11457C"
-                android:endColor="#102F7C" />
-
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/OCH/mogo-och-bus/src/main/res/layout/activity_bus_switch_line.xml b/OCH/mogo-och-bus/src/main/res/layout/activity_bus_switch_line.xml
index 95482563ea..e5d7b2d7f5 100644
--- a/OCH/mogo-och-bus/src/main/res/layout/activity_bus_switch_line.xml
+++ b/OCH/mogo-och-bus/src/main/res/layout/activity_bus_switch_line.xml
@@ -50,18 +50,19 @@
 
     <TextView
         android:id="@+id/switch_line_btn_commit"
-        android:layout_width="@dimen/bus_switch_line_btn_width"
-        android:layout_height="@dimen/bus_switch_line_btn_height"
+        android:layout_width="match_parent"
+        android:layout_marginStart="@dimen/dp_80"
+        android:layout_marginEnd="@dimen/dp_80"
+        android:layout_height="126px"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         android:layout_marginBottom="@dimen/bus_switch_line_btn_margin_b"
         android:textSize="@dimen/dp_42"
-        android:textColor="@color/bus_switch_btn_bg_half"
+        android:textColor="@android:color/white"
         android:text="@string/bus_switch_line_btn_txt"
-        android:visibility="gone"
         android:gravity="center"
-        android:background="@drawable/bus_switch_line_btn_un_commit"/>
+        android:background="@drawable/bus_switch_line_btn_commit"/>
     <include
         android:layout_width="match_parent"
         android:layout_height="wrap_content"