From 0361f47762f9958f2ec91fdb62bfc98de4e162a6 Mon Sep 17 00:00:00 2001
From: lmw <125975490@qq.com>
Date: 星期一, 14 四月 2025 15:16:17 +0800
Subject: [PATCH] save
---
app/release/output.json | 2
app/src/main/AndroidManifest.xml | 4
app/release/xianning-1.96-2025-04-14.apk | 0
app/src/main/java/com/xianning/driver/bean/OrderPayBean.java | 5
app/build.gradle | 4
app/src/main/res/layout/activity_mine.xml | 676 ++++++++++++++++++++++++++++---------------------------
6 files changed, 352 insertions(+), 339 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 43dbb6b..8c36aff 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -24,8 +24,8 @@
applicationId "com.xianning.driver"
minSdkVersion 26
targetSdkVersion 30
- versionCode 18
- versionName "1.95"
+ versionCode 19
+ versionName "1.96"
multiDexEnabled true
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/app/release/output.json b/app/release/output.json
index bffbee1..445d546 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":18,"versionName":"1.95","enabled":true,"outputFile":"xianning-1.95-2025-03-14.apk","fullName":"release","baseName":"release","dirName":""},"path":"xianning-1.95-2025-03-14.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":19,"versionName":"1.96","enabled":true,"outputFile":"xianning-1.96-2025-04-14.apk","fullName":"release","baseName":"release","dirName":""},"path":"xianning-1.96-2025-04-14.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/release/xianning-1.95-2025-03-14.apk b/app/release/xianning-1.96-2025-04-14.apk
similarity index 97%
rename from app/release/xianning-1.95-2025-03-14.apk
rename to app/release/xianning-1.96-2025-04-14.apk
index cf0d5c0..02e59a0 100644
--- a/app/release/xianning-1.95-2025-03-14.apk
+++ b/app/release/xianning-1.96-2025-04-14.apk
Binary files differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index edb94e2..75b00c1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -47,7 +47,9 @@
<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
-
+ <queries>
+ <package android:name="com.tencent.mm" />
+ </queries>
<application
android:name="com.xianning.driver.base.MyApplication"
android:icon="@mipmap/ic_launcher"
diff --git a/app/src/main/java/com/xianning/driver/bean/OrderPayBean.java b/app/src/main/java/com/xianning/driver/bean/OrderPayBean.java
index 7ea00c4..e048c46 100644
--- a/app/src/main/java/com/xianning/driver/bean/OrderPayBean.java
+++ b/app/src/main/java/com/xianning/driver/bean/OrderPayBean.java
@@ -15,14 +15,17 @@
* prepayId : wx04092206795139b261aec9ed1662249600
* nonceStr : guog3igbptbomexqahr17t22ggjsk0dg
*/
-
+ @SerializedName("timestamp")
private String timeStamp;
@SerializedName("package")
private String packageX;
private String appid;
private String sign;
+ @SerializedName("partnerid")
private String partnerId;
+ @SerializedName("prepayid")
private String prepayId;
+ @SerializedName("noncestr")
private String nonceStr;
diff --git a/app/src/main/res/layout/activity_mine.xml b/app/src/main/res/layout/activity_mine.xml
index e0ba4e8..d907a0c 100644
--- a/app/src/main/res/layout/activity_mine.xml
+++ b/app/src/main/res/layout/activity_mine.xml
@@ -176,382 +176,390 @@
</LinearLayout>
- <LinearLayout
+ <ScrollView
+ android:layout_below="@id/ll_center"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_below="@+id/ll_center"
- android:layout_marginTop="10dp"
- android:background="@color/white"
- android:orientation="vertical">
-
- <RelativeLayout
- android:id="@+id/rl_mine_eval"
+ android:layout_marginBottom="52dp"
+ android:layout_height="match_parent">
+ <LinearLayout
android:layout_width="match_parent"
- android:layout_height="43dp">
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/ll_center"
+ android:layout_marginTop="10dp"
+ android:background="@color/white"
+ android:orientation="vertical">
- <TextView
+ <RelativeLayout
+ android:id="@+id/rl_mine_eval"
android:layout_width="match_parent"
- android:layout_height="43dp"
- android:alpha="0.8"
- android:background="@color/white"
- android:drawableEnd="@mipmap/more_black"
- android:drawablePadding="10dp"
- android:gravity="center_vertical"
- android:paddingStart="42dp"
- android:paddingEnd="15dp"
- android:text="我的评价"
- android:textColor="@color/black"
- android:textSize="15sp"
- android:textStyle="bold" />
+ android:layout_height="43dp">
- <ImageView
- android:layout_width="16dp"
- android:layout_height="wrap_content"
- android:layout_centerVertical="true"
- android:layout_marginStart="15dp"
- android:src="@mipmap/icon_me_evaluation" />
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="43dp"
+ android:alpha="0.8"
+ android:background="@color/white"
+ android:drawableEnd="@mipmap/more_black"
+ android:drawablePadding="10dp"
+ android:gravity="center_vertical"
+ android:paddingStart="42dp"
+ android:paddingEnd="15dp"
+ android:text="我的评价"
+ android:textColor="@color/black"
+ android:textSize="15sp"
+ android:textStyle="bold" />
- </RelativeLayout>
+ <ImageView
+ android:layout_width="16dp"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:layout_marginStart="15dp"
+ android:src="@mipmap/icon_me_evaluation" />
- <View
- android:layout_width="match_parent"
- android:layout_height="4dp"
- android:background="@color/white" />
+ </RelativeLayout>
- <include layout="@layout/include_line_left_15" />
-
- <RelativeLayout
- android:id="@+id/rl_acount_safe"
- android:layout_width="match_parent"
- android:layout_height="43dp">
-
- <TextView
+ <View
android:layout_width="match_parent"
- android:layout_height="43dp"
- android:alpha="0.8"
- android:background="@color/white"
- android:drawableEnd="@mipmap/more_black"
- android:drawablePadding="10dp"
- android:gravity="center_vertical"
- android:paddingStart="42dp"
- android:paddingEnd="15dp"
- android:text="账户安全"
- android:textColor="@color/black"
- android:textSize="15sp"
- android:textStyle="bold" />
+ android:layout_height="4dp"
+ android:background="@color/white" />
- <ImageView
- android:layout_width="16dp"
- android:layout_height="wrap_content"
- android:layout_centerVertical="true"
- android:layout_marginStart="15dp"
- android:src="@mipmap/icon_me_safety" />
+ <include layout="@layout/include_line_left_15" />
- </RelativeLayout>
-
- <View
- android:layout_width="match_parent"
- android:layout_height="4dp"
- android:background="@color/white" />
-
- <include layout="@layout/include_line_left_15" />
-
- <RelativeLayout
- android:id="@+id/rl_remark"
- android:layout_width="match_parent"
- android:layout_height="43dp">
-
- <TextView
+ <RelativeLayout
+ android:id="@+id/rl_acount_safe"
android:layout_width="match_parent"
- android:layout_height="43dp"
- android:alpha="0.8"
- android:background="@color/white"
- android:drawableEnd="@mipmap/more_black"
- android:drawablePadding="10dp"
- android:gravity="center_vertical"
- android:paddingStart="42dp"
- android:paddingEnd="15dp"
- android:text="意见反馈"
- android:textColor="@color/black"
- android:textSize="15sp"
- android:textStyle="bold" />
+ android:layout_height="43dp">
- <ImageView
- android:layout_width="16dp"
- android:layout_height="wrap_content"
- android:layout_centerVertical="true"
- android:layout_marginStart="15dp"
- android:src="@mipmap/icon_me_edit" />
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="43dp"
+ android:alpha="0.8"
+ android:background="@color/white"
+ android:drawableEnd="@mipmap/more_black"
+ android:drawablePadding="10dp"
+ android:gravity="center_vertical"
+ android:paddingStart="42dp"
+ android:paddingEnd="15dp"
+ android:text="账户安全"
+ android:textColor="@color/black"
+ android:textSize="15sp"
+ android:textStyle="bold" />
- </RelativeLayout>
+ <ImageView
+ android:layout_width="16dp"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:layout_marginStart="15dp"
+ android:src="@mipmap/icon_me_safety" />
- <RelativeLayout
- android:id="@+id/rl_set_order"
- android:visibility="gone"
- android:layout_width="match_parent"
- android:layout_height="43dp">
+ </RelativeLayout>
- <TextView
+ <View
android:layout_width="match_parent"
- android:layout_height="43dp"
- android:alpha="0.8"
- android:background="@color/white"
- android:drawableEnd="@mipmap/more_black"
- android:drawablePadding="10dp"
- android:gravity="center_vertical"
- android:paddingStart="42dp"
- android:paddingEnd="15dp"
- android:text="接单设置"
- android:textColor="@color/black"
- android:textSize="15sp"
- android:textStyle="bold" />
+ android:layout_height="4dp"
+ android:background="@color/white" />
- <ImageView
- android:layout_width="16dp"
- android:layout_height="wrap_content"
- android:layout_centerVertical="true"
- android:layout_marginStart="15dp"
- android:src="@mipmap/icon_me_orders" />
+ <include layout="@layout/include_line_left_15" />
- </RelativeLayout>
-
- <View
- android:layout_width="match_parent"
- android:layout_height="4dp"
- android:background="@color/white" />
- <View
- android:layout_width="match_parent"
- android:layout_height="4dp"
- android:background="#F3F4F5" />
-
- <RelativeLayout
- android:id="@+id/rl_change_car"
- android:layout_width="match_parent"
- android:layout_height="43dp">
-
- <TextView
+ <RelativeLayout
+ android:id="@+id/rl_remark"
android:layout_width="match_parent"
- android:layout_height="43dp"
- android:alpha="0.8"
- android:background="@color/white"
- android:drawableEnd="@mipmap/more_black"
- android:drawablePadding="10dp"
- android:gravity="center_vertical"
- android:paddingStart="42dp"
- android:paddingEnd="15dp"
- android:text="车辆列表"
- android:textColor="@color/black"
- android:textSize="15sp"
- android:textStyle="bold" />
+ android:layout_height="43dp">
- <ImageView
- android:layout_width="16dp"
- android:layout_height="wrap_content"
- android:layout_centerVertical="true"
- android:layout_marginStart="15dp"
- android:src="@mipmap/icon_me_car" />
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="43dp"
+ android:alpha="0.8"
+ android:background="@color/white"
+ android:drawableEnd="@mipmap/more_black"
+ android:drawablePadding="10dp"
+ android:gravity="center_vertical"
+ android:paddingStart="42dp"
+ android:paddingEnd="15dp"
+ android:text="意见反馈"
+ android:textColor="@color/black"
+ android:textSize="15sp"
+ android:textStyle="bold" />
- </RelativeLayout>
+ <ImageView
+ android:layout_width="16dp"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:layout_marginStart="15dp"
+ android:src="@mipmap/icon_me_edit" />
- <View
- android:layout_width="match_parent"
- android:layout_height="4dp"
- android:background="@color/white" />
+ </RelativeLayout>
-
- <View
- android:layout_width="match_parent"
- android:layout_height="4dp"
- android:background="#F3F4F5" />
-
- <RelativeLayout
- android:id="@+id/rl_put_friend"
- android:layout_width="match_parent"
- android:layout_height="43dp">
-
- <TextView
+ <RelativeLayout
+ android:id="@+id/rl_set_order"
+ android:visibility="gone"
android:layout_width="match_parent"
- android:layout_height="43dp"
- android:alpha="0.8"
- android:background="@color/white"
- android:drawableEnd="@mipmap/more_black"
- android:drawablePadding="10dp"
- android:gravity="center_vertical"
- android:paddingStart="42dp"
- android:paddingEnd="15dp"
- android:text="推荐给好友"
- android:textColor="@color/black"
- android:textSize="15sp"
- android:textStyle="bold" />
+ android:layout_height="43dp">
- <ImageView
- android:layout_width="16dp"
- android:layout_height="wrap_content"
- android:layout_centerVertical="true"
- android:layout_marginStart="15dp"
- android:src="@mipmap/icon_me_people" />
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="43dp"
+ android:alpha="0.8"
+ android:background="@color/white"
+ android:drawableEnd="@mipmap/more_black"
+ android:drawablePadding="10dp"
+ android:gravity="center_vertical"
+ android:paddingStart="42dp"
+ android:paddingEnd="15dp"
+ android:text="接单设置"
+ android:textColor="@color/black"
+ android:textSize="15sp"
+ android:textStyle="bold" />
- </RelativeLayout>
+ <ImageView
+ android:layout_width="16dp"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:layout_marginStart="15dp"
+ android:src="@mipmap/icon_me_orders" />
- <View
- android:layout_width="match_parent"
- android:layout_height="4dp"
- android:background="@color/white" />
+ </RelativeLayout>
- <include layout="@layout/include_line_left_15" />
-
- <RelativeLayout
- android:id="@+id/rl_call_server"
- android:layout_width="match_parent"
- android:layout_height="43dp">
-
-
- <TextView
+ <View
android:layout_width="match_parent"
- android:layout_height="43dp"
- android:alpha="0.8"
- android:background="@color/white"
- android:drawableEnd="@mipmap/more_black"
- android:drawablePadding="10dp"
- android:gravity="center_vertical"
- android:paddingStart="42dp"
- android:paddingEnd="15dp"
- android:text="联系客服"
- android:textColor="@color/black"
- android:textSize="15sp"
- android:textStyle="bold" />
-
-
- <ImageView
- android:layout_width="16dp"
- android:layout_height="wrap_content"
- android:layout_centerVertical="true"
- android:layout_marginStart="15dp"
- android:src="@mipmap/icon_me_services" />
-
- </RelativeLayout>
-
-
- <View
- android:layout_width="match_parent"
- android:layout_height="4dp"
- android:background="@color/white" />
-
- <include layout="@layout/include_line_left_15" />
-
- <RelativeLayout
- android:id="@+id/rl_invite"
- android:layout_width="match_parent"
- android:layout_height="43dp">
-
- <TextView
+ android:layout_height="4dp"
+ android:background="@color/white" />
+ <View
android:layout_width="match_parent"
- android:layout_height="43dp"
- android:alpha="0.8"
- android:background="@color/white"
- android:drawableEnd="@mipmap/more_black"
- android:drawablePadding="10dp"
- android:gravity="center_vertical"
- android:paddingStart="42dp"
- android:paddingEnd="15dp"
- android:text="邀请有礼"
- android:textColor="@color/black"
- android:textSize="15sp"
- android:textStyle="bold" />
+ android:layout_height="4dp"
+ android:background="#F3F4F5" />
- <ImageView
- android:layout_width="16dp"
- android:layout_height="wrap_content"
- android:layout_centerVertical="true"
- android:layout_marginStart="15dp"
- android:src="@mipmap/invite" />
-
- </RelativeLayout>
-
- <View
- android:layout_width="match_parent"
- android:layout_height="4dp"
- android:background="@color/white" />
-
- <include layout="@layout/include_line_left_15" />
-
- <RelativeLayout
- android:id="@+id/ll_qr"
- android:visibility="gone"
- android:layout_width="match_parent"
- android:layout_height="43dp">
-
- <TextView
+ <RelativeLayout
+ android:id="@+id/rl_change_car"
android:layout_width="match_parent"
- android:layout_height="43dp"
- android:alpha="0.8"
- android:background="@color/white"
- android:drawableEnd="@mipmap/more_black"
- android:drawablePadding="10dp"
- android:gravity="center_vertical"
- android:paddingStart="42dp"
- android:paddingEnd="15dp"
- android:text="二维码"
- android:textColor="@color/black"
- android:textSize="15sp"
- android:textStyle="bold" />
+ android:layout_height="43dp">
- <ImageView
- android:layout_width="16dp"
- android:layout_height="wrap_content"
- android:layout_centerVertical="true"
- android:layout_marginStart="15dp"
- android:src="@mipmap/icon_me_code" />
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="43dp"
+ android:alpha="0.8"
+ android:background="@color/white"
+ android:drawableEnd="@mipmap/more_black"
+ android:drawablePadding="10dp"
+ android:gravity="center_vertical"
+ android:paddingStart="42dp"
+ android:paddingEnd="15dp"
+ android:text="车辆列表"
+ android:textColor="@color/black"
+ android:textSize="15sp"
+ android:textStyle="bold" />
- </RelativeLayout>
+ <ImageView
+ android:layout_width="16dp"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:layout_marginStart="15dp"
+ android:src="@mipmap/icon_me_car" />
- <View
- android:layout_width="match_parent"
- android:layout_height="4dp"
- android:visibility="gone"
- android:background="@color/white" />
+ </RelativeLayout>
- <include layout="@layout/include_line_left_15" />
-
- <RelativeLayout
- android:id="@+id/rl_setting"
- android:layout_width="match_parent"
- android:layout_height="43dp">
-
- <TextView
+ <View
android:layout_width="match_parent"
- android:layout_height="43dp"
- android:alpha="0.8"
- android:background="@color/white"
- android:drawableEnd="@mipmap/more_black"
- android:drawablePadding="10dp"
- android:gravity="center_vertical"
- android:paddingStart="42dp"
- android:paddingEnd="15dp"
- android:text="设置"
- android:textColor="@color/black"
- android:textSize="15sp"
- android:textStyle="bold" />
+ android:layout_height="4dp"
+ android:background="@color/white" />
- <ImageView
- android:layout_width="16dp"
- android:layout_height="wrap_content"
- android:layout_centerVertical="true"
- android:layout_marginStart="15dp"
- android:src="@mipmap/icon_me_set" />
- </RelativeLayout>
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="4dp"
+ android:background="#F3F4F5" />
- <View
- android:layout_width="match_parent"
- android:layout_height="4dp"
- android:background="@color/white" />
- <Space
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="1"/>
+ <RelativeLayout
+ android:id="@+id/rl_put_friend"
+ android:layout_width="match_parent"
+ android:layout_height="43dp">
- </LinearLayout>
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="43dp"
+ android:alpha="0.8"
+ android:background="@color/white"
+ android:drawableEnd="@mipmap/more_black"
+ android:drawablePadding="10dp"
+ android:gravity="center_vertical"
+ android:paddingStart="42dp"
+ android:paddingEnd="15dp"
+ android:text="推荐给好友"
+ android:textColor="@color/black"
+ android:textSize="15sp"
+ android:textStyle="bold" />
+
+ <ImageView
+ android:layout_width="16dp"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:layout_marginStart="15dp"
+ android:src="@mipmap/icon_me_people" />
+
+ </RelativeLayout>
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="4dp"
+ android:background="@color/white" />
+
+ <include layout="@layout/include_line_left_15" />
+
+ <RelativeLayout
+ android:id="@+id/rl_call_server"
+ android:layout_width="match_parent"
+ android:layout_height="43dp">
+
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="43dp"
+ android:alpha="0.8"
+ android:background="@color/white"
+ android:drawableEnd="@mipmap/more_black"
+ android:drawablePadding="10dp"
+ android:gravity="center_vertical"
+ android:paddingStart="42dp"
+ android:paddingEnd="15dp"
+ android:text="联系客服"
+ android:textColor="@color/black"
+ android:textSize="15sp"
+ android:textStyle="bold" />
+
+
+ <ImageView
+ android:layout_width="16dp"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:layout_marginStart="15dp"
+ android:src="@mipmap/icon_me_services" />
+
+ </RelativeLayout>
+
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="4dp"
+ android:background="@color/white" />
+
+ <include layout="@layout/include_line_left_15" />
+
+ <RelativeLayout
+ android:id="@+id/rl_invite"
+ android:layout_width="match_parent"
+ android:layout_height="43dp">
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="43dp"
+ android:alpha="0.8"
+ android:background="@color/white"
+ android:drawableEnd="@mipmap/more_black"
+ android:drawablePadding="10dp"
+ android:gravity="center_vertical"
+ android:paddingStart="42dp"
+ android:paddingEnd="15dp"
+ android:text="邀请有礼"
+ android:textColor="@color/black"
+ android:textSize="15sp"
+ android:textStyle="bold" />
+
+ <ImageView
+ android:layout_width="16dp"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:layout_marginStart="15dp"
+ android:src="@mipmap/invite" />
+
+ </RelativeLayout>
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="4dp"
+ android:background="@color/white" />
+
+ <include layout="@layout/include_line_left_15" />
+
+ <RelativeLayout
+ android:id="@+id/ll_qr"
+ android:visibility="gone"
+ android:layout_width="match_parent"
+ android:layout_height="43dp">
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="43dp"
+ android:alpha="0.8"
+ android:background="@color/white"
+ android:drawableEnd="@mipmap/more_black"
+ android:drawablePadding="10dp"
+ android:gravity="center_vertical"
+ android:paddingStart="42dp"
+ android:paddingEnd="15dp"
+ android:text="二维码"
+ android:textColor="@color/black"
+ android:textSize="15sp"
+ android:textStyle="bold" />
+
+ <ImageView
+ android:layout_width="16dp"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:layout_marginStart="15dp"
+ android:src="@mipmap/icon_me_code" />
+
+ </RelativeLayout>
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="4dp"
+ android:visibility="gone"
+ android:background="@color/white" />
+
+ <include layout="@layout/include_line_left_15" />
+
+ <RelativeLayout
+ android:id="@+id/rl_setting"
+ android:layout_width="match_parent"
+ android:layout_height="43dp">
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="43dp"
+ android:alpha="0.8"
+ android:background="@color/white"
+ android:drawableEnd="@mipmap/more_black"
+ android:drawablePadding="10dp"
+ android:gravity="center_vertical"
+ android:paddingStart="42dp"
+ android:paddingEnd="15dp"
+ android:text="设置"
+ android:textColor="@color/black"
+ android:textSize="15sp"
+ android:textStyle="bold" />
+
+ <ImageView
+ android:layout_width="16dp"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:layout_marginStart="15dp"
+ android:src="@mipmap/icon_me_set" />
+
+ </RelativeLayout>
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="4dp"
+ android:background="@color/white" />
+ <Space
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1"/>
+
+ </LinearLayout>
+
+ </ScrollView>
+
</RelativeLayout>
<RelativeLayout
--
Gitblit v1.7.1