From dfd4367d5c4a64743b2a842602a94578b993fdde Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期三, 22 四月 2020 09:27:15 +0800
Subject: [PATCH] 完成所有页面基础，还需完善细节
---
app/src/main/res/layout/activity_main.xml | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 9d83b34..e8f9ccd 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,16 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:orientation="vertical"
tools:context=".MainActivity">
-
+ <include layout="@layout/networktoolbar"/>
<FrameLayout
- android:id="@+id/fl_container"
- android:background="@drawable/ic_bground"
android:layout_width="match_parent"
- android:layout_marginBottom="@dimen/bottombar_height"
- android:layout_height="match_parent"/>
+ android:layout_height="match_parent">
+ <FrameLayout
+ android:id="@+id/fl_container"
+ android:background="@drawable/ic_bground"
+ android:layout_width="match_parent"
+ android:layout_marginBottom="@dimen/bottombar_height"
+ android:layout_height="match_parent">
+ <Button
+ android:id="@+id/btn_return"
+ android:layout_width="128dp"
+ android:layout_height="48dp"
+ android:background="@mipmap/return_bg"
+ android:drawableLeft="@mipmap/return_pic"
+ android:paddingLeft="20dp"
+ android:text="杩斿洖"
+ android:gravity="center_vertical"
+ android:drawablePadding="@dimen/ui_margin_5dp"
+ android:layout_gravity="bottom|end"
+ android:textColor="#FFFFFF"
+ android:textSize="@dimen/network_train_textsize24px" />
+ </FrameLayout>
+ </FrameLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+
+
+</LinearLayout>
\ No newline at end of file
--
Gitblit v1.8.0