Merge remote-tracking branch 'origin/master'

tj

2 天以前 93775e1f3d79a1e11b839abbf24201dafcd9e646

 app/src/main/res/layout/fragment_home.xml

@@ -73,29 +73,29 @@
                        android:singleLine="true"
                        android:ellipsize="end" />

                    <com.example.firstapp.view.UnderlineTextView
                        android:id="@+id/tabFlight"
                        android:layout_width="0dp"
                        android:layout_height="match_parent"
                        android:layout_weight="1"
                        android:gravity="center"
                        android:padding="4dp"
                        android:text="航班"
                        android:textSize="14sp"
                        android:singleLine="true"
                        android:ellipsize="end" />
<!--                    <com.example.firstapp.view.UnderlineTextView-->
<!--                        android:id="@+id/tabFlight"-->
<!--                        android:layout_width="0dp"-->
<!--                        android:layout_height="match_parent"-->
<!--                        android:layout_weight="1"-->
<!--                        android:gravity="center"-->
<!--                        android:padding="4dp"-->
<!--                        android:text="航班"-->
<!--                        android:textSize="14sp"-->
<!--                        android:singleLine="true"-->
<!--                        android:ellipsize="end" />-->

                    <com.example.firstapp.view.UnderlineTextView
                        android:id="@+id/tabTrain"
                        android:layout_width="0dp"
                        android:layout_height="match_parent"
                        android:layout_weight="1"
                        android:gravity="center"
                        android:padding="4dp"
                        android:text="火车票"
                        android:textSize="14sp"
                        android:singleLine="true"
                        android:ellipsize="end" />
<!--                    <com.example.firstapp.view.UnderlineTextView-->
<!--                        android:id="@+id/tabTrain"-->
<!--                        android:layout_width="0dp"-->
<!--                        android:layout_height="match_parent"-->
<!--                        android:layout_weight="1"-->
<!--                        android:gravity="center"-->
<!--                        android:padding="4dp"-->
<!--                        android:text="火车票"-->
<!--                        android:textSize="14sp"-->
<!--                        android:singleLine="true"-->
<!--                        android:ellipsize="end" />-->
                </LinearLayout>

                <!-- 右侧图标区域 -->