-
Notifications
You must be signed in to change notification settings - Fork 1
/
tatus
233 lines (233 loc) · 12 KB
/
tatus
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
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
warning: LF will be replaced by CRLF in .idea/misc.xml.
The file will have its original line endings in your working directory.
[1mdiff --git a/.idea/gradle.xml b/.idea/gradle.xml[m
[1mindex 10a7c81..fe72da5 100644[m
[1m--- a/.idea/gradle.xml[m
[1m+++ b/.idea/gradle.xml[m
[36m@@ -5,7 +5,7 @@[m
<GradleProjectSettings>[m
<option name="distributionType" value="LOCAL" />[m
<option name="externalProjectPath" value="$PROJECT_DIR$" />[m
[31m- <option name="gradleHome" value="E:\Android Studio\gradle\gradle-2.14.1" />[m
[32m+[m[32m <option name="gradleHome" value="C:\Program Files\Android\Android Studio\gradle\gradle-2.14.1" />[m
<option name="modules">[m
<set>[m
<option value="$PROJECT_DIR$" />[m
[1mdiff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml[m
[1mindex 93e9e86..467e7a9 100644[m
[1m--- a/.idea/inspectionProfiles/Project_Default.xml[m
[1m+++ b/.idea/inspectionProfiles/Project_Default.xml[m
[36m@@ -3,6 +3,7 @@[m
<option name="myName" value="Project Default" />[m
<inspection_tool class="AndroidLintDuplicateIds" enabled="false" level="ERROR" enabled_by_default="false" />[m
<inspection_tool class="AndroidLintNewApi" enabled="false" level="ERROR" enabled_by_default="false" />[m
[32m+[m[32m <inspection_tool class="AndroidLintRtlHardcoded" enabled="false" level="WARNING" enabled_by_default="false" />[m
<inspection_tool class="LoggerInitializedWithForeignClass" enabled="false" level="WARNING" enabled_by_default="false">[m
<option name="loggerClassName" value="org.apache.log4j.Logger,org.slf4j.LoggerFactory,org.apache.commons.logging.LogFactory,java.util.logging.Logger" />[m
<option name="loggerFactoryMethodName" value="getLogger,getLogger,getLog,getLogger" />[m
[1mdiff --git a/.idea/misc.xml b/.idea/misc.xml[m
[1mindex 5d19981..fbb6828 100644[m
[1m--- a/.idea/misc.xml[m
[1m+++ b/.idea/misc.xml[m
[36m@@ -37,7 +37,7 @@[m
<ConfirmationsSetting value="0" id="Add" />[m
<ConfirmationsSetting value="0" id="Remove" />[m
</component>[m
[31m- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">[m
[32m+[m[32m <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">[m
<output url="file://$PROJECT_DIR$/build/classes" />[m
</component>[m
<component name="ProjectType">[m
[1mdiff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml[m
[1mindex e50681e..d340ea8 100644[m
[1m--- a/app/src/main/res/layout/activity_main.xml[m
[1m+++ b/app/src/main/res/layout/activity_main.xml[m
[36m@@ -82,13 +82,11 @@[m
android:layout_width="match_parent"[m
android:layout_height="match_parent"[m
app:layout_behavior="@string/appbar_scrolling_view_behavior">[m
[31m- </android.support.v7.widget.RecyclerView>[m
[31m-[m
[31m- </android.support.v4.widget.SwipeRefreshLayout>[m
[31m-[m
[m
[m
[32m+[m[32m </android.support.v7.widget.RecyclerView>[m
[m
[32m+[m[32m </android.support.v4.widget.SwipeRefreshLayout>[m
[m
</android.support.design.widget.CoordinatorLayout>[m
<RelativeLayout[m
* Unmerged path app/src/main/res/layout/help_header.xml
[1mdiff --git a/app/src/main/res/layout/help_information.xml b/app/src/main/res/layout/help_information.xml[m
[1mindex 3509b84..678640d 100644[m
[1m--- a/app/src/main/res/layout/help_information.xml[m
[1m+++ b/app/src/main/res/layout/help_information.xml[m
[36m@@ -1,6 +1,133 @@[m
<?xml version="1.0" encoding="utf-8"?>[m
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"[m
[31m- android:orientation="vertical" android:layout_width="match_parent"[m
[31m- android:layout_height="match_parent">[m
[32m+[m[32m android:orientation="vertical"[m
[32m+[m[32m android:layout_width="match_parent"[m
[32m+[m[32m android:background="#ffffff"[m
[32m+[m[32m android:layout_height="wrap_content">[m
[m
[31m-</LinearLayout>[m
\ No newline at end of file[m
[32m+[m[32m<!--这是时间栏-->[m
[32m+[m[32m <LinearLayout[m
[32m+[m[32m android:layout_marginLeft="10dp"[m
[32m+[m[32m android:layout_marginRight="10dp"[m
[32m+[m[32m android:layout_marginTop="10dp"[m
[32m+[m[32m android:orientation="horizontal"[m
[32m+[m[32m android:layout_width="wrap_content"[m
[32m+[m[32m android:layout_height="wrap_content">[m
[32m+[m
[32m+[m[32m <ImageView[m
[32m+[m[32m android:src="@drawable/help_time"[m
[32m+[m[32m android:layout_width="20dp"[m
[32m+[m[32m android:layout_height="20dp" />[m
[32m+[m[32m <!--这是下单的后的期限时间-->[m
[32m+[m[32m <TextView[m
[32m+[m[32m android:id="@+id/help_time"[m
[32m+[m[32m android:layout_marginLeft="2dp"[m
[32m+[m[32m android:text="100年之后过期"[m
[32m+[m[32m android:layout_width="wrap_content"[m
[32m+[m[32m android:layout_height="wrap_content" />[m
[32m+[m
[32m+[m[32m </LinearLayout>[m
[32m+[m
[32m+[m[32m <view[m
[32m+[m[32m android:layout_margin="10dp"[m
[32m+[m[32m android:background="#e1dada"[m
[32m+[m[32m android:layout_width="match_parent"[m
[32m+[m[32m android:layout_height="0.5dp" />[m
[32m+[m
[32m+[m[32m <!--这是用户发布的信息-->[m
[32m+[m[32m <LinearLayout[m
[32m+[m[32m android:layout_marginLeft="10dp"[m
[32m+[m[32m android:layout_marginRight="10dp"[m
[32m+[m[32m android:orientation="vertical"[m
[32m+[m[32m android:layout_width="wrap_content"[m
[32m+[m[32m android:layout_height="wrap_content">[m
[32m+[m[32m <view[m
[32m+[m[32m android:background="#fff"[m
[32m+[m[32m android:layout_width="match_parent"[m
[32m+[m[32m android:layout_height="0.5dp"/>[m
[32m+[m[32m <!--这是内容头标题-->[m
[32m+[m[32m <TextView[m
[32m+[m[32m android:id="@+id/help_title_content"[m
[32m+[m[32m android:textColor="#030303"[m
[32m+[m[32m android:textSize="20sp"[m
[32m+[m[32m android:maxLines="1"[m
[32m+[m[32m android:ellipsize="end"[m
[32m+[m[32m android:text="我有5只老虎，因为要出去旅游，所以需要人帮忙照看下老虎"[m
[32m+[m[32m android:layout_width="wrap_content"[m
[32m+[m[32m android:layout_height="wrap_content" />[m
[32m+[m[32m <!--这是内容-->[m
[32m+[m[32m <TextView[m
[32m+[m[32m android:id="@+id/help_content"[m
[32m+[m[32m android:layout_marginTop="4dp"[m
[32m+[m[32m android:textColor="#84181717"[m
[32m+[m[32m android:text="我有5只老虎，因为要出去旅游，所以需要人帮忙照看下老虎"[m
[32m+[m[32m android:layout_width="wrap_content"[m
[32m+[m[32m android:layout_height="wrap_content" />[m
[32m+[m[32m <view[m
[32m+[m[32m android:layout_margin="0.1dp"[m
[32m+[m[32m android:background="#fff"[m
[32m+[m[32m android:layout_width="match_parent"[m
[32m+[m[32m android:layout_height="0.1dp" />[m
[32m+[m[32m </LinearLayout>[m
[32m+[m
[32m+[m
[32m+[m[32m <view[m
[32m+[m[32m android:layout_margin="10dp"[m
[32m+[m[32m android:background="#dfd9d9"[m
[32m+[m[32m android:layout_width="match_parent"[m
[32m+[m[32m android:layout_height="0.5dp" />[m
[32m+[m
[32m+[m[32m <!--这是标签栏和价格栏-->[m
[32m+[m[32m <RelativeLayout[m
[32m+[m[32m android:orientation="horizontal"[m
[32m+[m[32m android:layout_marginLeft="10dp"[m
[32m+[m[32m android:layout_marginRight="10dp"[m
[32m+[m[32m android:layout_width="match_parent"[m
[32m+[m[32m android:layout_height="wrap_content">[m
[32m+[m[32m <!--标签图标-->[m
[32m+[m[32m <ImageView[m
[32m+[m[32m android:id="@+id/help_label_image"[m
[32m+[m[32m android:src="@drawable/help_animal_label"[m
[32m+[m[32m android:layout_width="30dp"[m
[32m+[m[32m android:layout_height="30dp"[m
[32m+[m[32m />[m
[32m+[m[32m<!--用户定义的价钱-->[m
[32m+[m[32m <TextView[m
[32m+[m[32m android:layout_marginTop="6dp"[m
[32m+[m[32m android:id="@+id/help_price"[m
[32m+[m[32m android:textSize="20sp"[m
[32m+[m[32m android:textColor="#f2a408"[m
[32m+[m[32m android:text="20000.00"[m
[32m+[m[32m android:layout_width="wrap_content"[m
[32m+[m[32m android:layout_height="wrap_content"[m
[32m+[m[32m android:layout_alignTop="@+id/help_label"[m
[32m+[m[32m android:layout_alignParentRight="true"[m
[32m+[m[32m android:layout_alignParentEnd="true" />[m
[32m+[m
[32m+[m
[32m+[m[32m <ImageView[m
[32m+[m[32m android:layout_centerInParent="true"[m
[32m+[m[32m android:layout_margin="10dp"[m
[32m+[m[32m android:background="#dfd9d9"[m
[32m+[m[32m android:layout_width="0.5dp"[m
[32m+[m[32m android:layout_height="18dp" />[m
[32m+[m[32m<!--宠物标签-->[m
[32m+[m[32m <TextView[m
[32m+[m[32m android:id="@+id/help_label"[m
[32m+[m[32m android:layout_gravity="center"[m
[32m+[m[32m android:textSize="12sp"[m
[32m+[m[32m android:text="动物/宠物用品/代看"[m
[32m+[m[32m android:layout_width="wrap_content"[m
[32m+[m[32m android:layout_height="wrap_content"[m
[32m+[m[32m android:layout_marginLeft="12dp"[m
[32m+[m[32m android:layout_marginStart="12dp"[m
[32m+[m[32m android:layout_centerVertical="true"[m
[32m+[m[32m android:layout_toRightOf="@+id/help_label_image"[m
[32m+[m[32m android:layout_toEndOf="@+id/help_label_image" />[m
[32m+[m
[32m+[m[32m </RelativeLayout>[m
[32m+[m
[32m+[m[32m</LinearLayout>[m
[32m+[m
[32m+[m[32m<!--price : 价格-->[m
[32m+[m[32m<!--label ：标签-->[m
\ No newline at end of file[m
[1mdiff --git a/app/src/main/res/menu/help_menu.xml b/app/src/main/res/menu/help_menu.xml[m
[1mindex 24e9e84..6fb040d 100644[m
[1m--- a/app/src/main/res/menu/help_menu.xml[m
[1m+++ b/app/src/main/res/menu/help_menu.xml[m
[36m@@ -9,12 +9,11 @@[m
<item[m
android:id="@+id/help_myself"[m
android:icon="@mipmap/help_myself"[m
[31m- [m
android:title="@string/myself_name"/>[m
<!--help_myself 我的帮帮-->[m
<item[m
android:id="@+id/help_thing"[m
[31m- android:icon="@mipmap/help_thing"[m
[32m+[m[32m android:icon="@mipmap/y"[m
android:title="@string/thing_name"/>[m
<!--help_thing 我的礼包-->[m
<item[m
[1mdiff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml[m
[1mindex c35e4eb..8c4630d 100644[m
[1m--- a/app/src/main/res/values/colors.xml[m
[1m+++ b/app/src/main/res/values/colors.xml[m
[36m@@ -8,4 +8,6 @@[m
<!--这是搜索框的颜色-->[m
<color name="serchColor">#aeecff</color>[m
<color name="MainctivityBack">#ecf3f6</color>[m
[32m+[m[32m <!--这是用户发布信息字体颜色-->[m
[32m+[m
</resources>[m