Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

2025-10-15 2b287056e2f59518888d05a1bbc7e5a55fbd84d5

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="wrap_content"
    android:layout_height="wrap_content"
    android:background="@drawable/menu_round">
 
    <RelativeLayout
        android:id="@+id/relative_register"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:paddingTop="15dp"
        android:paddingBottom="15dp"
        android:paddingLeft="20dp"
        android:paddingRight="20dp"
        android:background="@drawable/button_selector_homemenu_item">
 
        <ImageView
            android:id="@+id/image_register"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:src="@mipmap/icon_pop_register" />
 
        <TextView
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="@string/home_face"
            android:layout_toRightOf="@id/image_register"
            android:layout_marginLeft="9dp"
            android:textColor="@color/white"
            android:textSize="16sp" />
    </RelativeLayout>
 
    <View
        android:id="@+id/view_1"
        android:layout_width="136dp"
        android:layout_height="1dp"
        android:layout_below="@id/relative_register"
        android:background="#777777"/>
 
    <View
        android:id="@+id/view_2"
        android:layout_width="136dp"
        android:layout_height="1dp"
        android:layout_below="@id/view_1"
        android:background="#777777"/>
 
    <RelativeLayout
        android:id="@+id/relative_delete"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_below="@id/view_2"
        android:paddingTop="15dp"
        android:paddingBottom="15dp"
        android:paddingLeft="20dp"
        android:paddingRight="20dp"
        android:background="@drawable/button_selector_homemenu_item1">
 
        <ImageView
            android:id="@+id/image_delete"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:src="@mipmap/icon_pop_delete" />
 
        <TextView
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="@string/user_tip2"
            android:layout_toRightOf="@id/image_delete"
            android:layout_marginLeft="9dp"
            android:textColor="@color/white"
            android:textSize="16sp" />
    </RelativeLayout>
 
</RelativeLayout>