129d6f629ed18fe6cR34">34 
                    if (onSoftKeyBoardChangeListener != null) {
35 
                        onSoftKeyBoardChangeListener.keyBoardShow(rootViewVisibleHeight - visibleHeight);
36 
                    }
37 
                    rootViewVisibleHeight = visibleHeight;
38 
                    return;
39 
                }
40 
                //根视图显示高度变大超过200，可以看作软键盘隐藏了
41 
                if (visibleHeight - rootViewVisibleHeight > 200) {
42 
                    if (onSoftKeyBoardChangeListener != null) {
43 
                        onSoftKeyBoardChangeListener.keyBoardHide(visibleHeight - rootViewVisibleHeight);
44 
                    }
45 
                    rootViewVisibleHeight = visibleHeight;
46 
                    return;
47 
                }
48 
            }
49 
        });
50 
    }
51 
    private void setOnSoftKeyBoardChangeListener(OnSoftKeyBoardChangeListener onSoftKeyBoardChangeListener) {
52 
        this.onSoftKeyBoardChangeListener = onSoftKeyBoardChangeListener;
53 
    }
54 
    public interface OnSoftKeyBoardChangeListener {
55 
        void keyBoardShow(int height);
56 
        void keyBoardHide(int height);
57 
    }
58 
    public static void setListener(Activity activity, OnSoftKeyBoardChangeListener onSoftKeyBoardChangeListener) {
59 
        SoftKeyBoardListener softKeyBoardListener = new SoftKeyBoardListener(activity);
60 
        softKeyBoardListener.setOnSoftKeyBoardChangeListener(onSoftKeyBoardChangeListener);
61 
    }
62 
}

+ 7 - 7
app/src/main/res/layout/activity_publish_items.xml
Bestand weergeven 

@ -53,10 +53,9 @@
53 53 
            android:orientation="horizontal">
54 54
55 55 
            <LinearLayout
56 
                android:id="@+id/publish_picture"
56 
                android:id="@+id/publish_video"
57 57 
                android:layout_width="wrap_content"
58 58 
                android:layout_height="wrap_content"
59 
                android:layout_centerHorizontal="true"
60 59 
                android:gravity="center"
61 60 
                android:orientation="vertical"
62 61 
                android:padding="20dp">

@ -64,21 +63,22 @@
64 63 
                <ImageView
65 64 
                    android:layout_width="wrap_content"
66 65 
                    android:layout_height="wrap_content"
67 
                    android:background="@drawable/app_publish_pic_icon" />
66 
                    android:background="@drawable/app_publish_video_icon" />
68 67
69 68 
                <TextView
70 69 
                    android:layout_width="wrap_content"
71 70 
                    android:layout_height="wrap_content"
72 71 
                    android:layout_marginTop="10dp"
73 
                    android:text="图文"
72 
                    android:text="视频"
74 73 
                    android:textColor="@color/color_222222"
75 74 
                    android:textSize="15sp" />
76 75 
            </LinearLayout>
77 76
78 77 
            <LinearLayout
79 
                android:id="@+id/publish_video"
78 
                android:id="@+id/publish_picture"
80 79 
                android:layout_width="wrap_content"
81 80 
                android:layout_height="wrap_content"
81 
                android:layout_centerHorizontal="true"
82 82 
                android:gravity="center"
83 83 
                android:orientation="vertical"
84 84 
                android:padding="20dp">

@ -86,13 +86,13 @@
86 86 
                <ImageView
87 87 
                    android:layout_width="wrap_content"
88 88 
                    android:layout_height="wrap_content"
89 
                    android:background="@drawable/app_publish_video_icon" />
89 
                    android:background="@drawable/app_publish_pic_icon" />
90 90
91 91 
                <TextView
92 92 
                    android:layout_width="wrap_content"
93 93 
                    android:layout_height="wrap_content"
94 94 
                    android:layout_marginTop="10dp"
95 
                    android:text="视频"
95 
                    android:text="图文"
96 96 
                    android:textColor="@color/color_222222"
97 97 
                    android:textSize="15sp" />
98 98 
            </LinearLayout>

+ 1 - 0
app/src/main/res/layout/fragment_chat_content_pictures.xml
Bestand weergeven 

@ -111,6 +111,7 @@
111 111 
                    android:id="@+id/topicTitle"
112 112 
                    android:layout_width="wrap_content"
113 113 
                    android:layout_height="wrap_content"
114 
                    android:ellipsize="end"
114 115 
                    android:maxLines="1"
115 116 
                    android:paddingLeft="5dp"
116 117 
                    android:textColor="#ffffff"

+ 2 - 1
app/src/main/res/layout/fragment_chat_content_video.xml
Bestand weergeven 

@ -127,6 +127,7 @@
127 127 
                    android:id="@+id/topicTitle"
128 128 
                    android:layout_width="wrap_content"
129 129 
                    android:layout_height="wrap_content"
130 
                    android:ellipsize="end"
130 131 
                    android:maxLines="1"
131 132 
                    android:paddingLeft="5dp"
132 133 
                    android:textColor="#ffffff"
 
@ -134,7 +135,7 @@
134 135 
                    app:layout_constraintBottom_toBottomOf="parent"
135 136 
                    app:layout_constraintLeft_toRightOf="@+id/topicIcon"
136 137 
                    app:layout_constraintTop_toTopOf="parent"
137 
                    tools:text="#新能源#" />
138 
                    tools:text="#新能源#是的咖啡机圣诞快乐附件可是大家反馈律师费了十多斤风口浪尖水电费会计师了多费劲考虑送到" />
138 139 
            </android.support.constraint.ConstraintLayout>
139 140
140 141

+ 73 - 0
app/src/main/res/layout/fragment_common_dialog.xml
Bestand weergeven 

@ -0,0 +1,73 @@
1 
<?xml version="1.0" encoding="utf-8"?>
2 
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 
    xmlns:app="http://schemas.android.com/apk/res-auto"
4 
    xmlns:tools="http://schemas.android.com/tools"
5 
    android:layout_width="match_parent"
6 
    android:background="#00f00f"
7 
    android:layout_height="match_parent">
8
9 
    <!-- 底部评论输入及发布 -->
10 
    <android.support.constraint.ConstraintLayout
11 
        android:layout_width="match_parent"
12 
        android:layout_height="wrap_content"
13 
        android:background="#535353"
14 
        android:minHeight="54dp"
15 
        app:layout_constraintBottom_toBottomOf="parent"
16 
        app:layout_constraintEnd_toEndOf="parent"
17 
        app:layout_constraintStart_toStartOf="parent">
18
19 
        <android.support.constraint.ConstraintLayout
20 
            android:id="@+id/bWriteComment"
21 
            android:layout_width="0dp"
22 
            android:layout_height="30dp"
23 
            android:layout_marginLeft="15dp"
24 
            android:background="@drawable/bg_comment_shape"
25 
            app:layout_constraintBottom_toBottomOf="parent"
26 
            app:layout_constraintLeft_toLeftOf="parent"
27 
            app:layout_constraintRight_toLeftOf="@+id/dialogPublish"
28 
            app:layout_constraintTop_toTopOf="parent">
29
30 
            <ImageView
31 
                android:id="@+id/dialogIcon"
32 
                android:layout_width="wrap_content"
33 
                android:layout_height="wrap_content"
34 
                android:layout_marginStart="15dp"
35 
                android:paddingRight="5dp"
36 
                app:layout_constraintBottom_toBottomOf="parent"
37 
                app:layout_constraintStart_toStartOf="parent"
38 
                app:layout_constraintTop_toTopOf="parent"
39 
                app:srcCompat="@drawable/write_comment_icon" />
40
41 
            <EditText
42 
                android:id="@+id/dialogEdit"
43 
                android:background="@null"
44 
                android:layout_width="0dp"
45 
                android:layout_height="wrap_content"
46 
                android:hint="优质评论会被优先展示"
47 
                android:textColor="#ffffff"
48 
                android:textColorHint="#7e7e7e"
49 
                android:textSize="14sp"
50 
                app:layout_constraintBottom_toBottomOf="parent"
51 
                app:layout_constraintRight_toRightOf="parent"
52 
                app:layout_constraintLeft_toRightOf="@+id/dialogIcon"
53 
                app:layout_constraintTop_toTopOf="parent" />
54 
        </android.support.constraint.ConstraintLayout>
55
56 
        <TextView
57 
            android:id="@+id/dialogPublish"
58 
            android:layout_width="wrap_content"
59 
            android:layout_height="0dp"
60 
            android:gravity="center_vertical"
61 
            android:paddingLeft="13dp"
62 
            android:paddingRight="15dp"
63 
            android:text="发布"
64 
            android:textColor="#7e7e7e"
65 
            android:textSize="14sp"
66 
            app:layout_constraintBottom_toBottomOf="parent"
67 
            app:layout_constraintRight_toRightOf="parent"
68 
            app:layout_constraintTop_toTopOf="parent"
69 
            tools:layout_editor_absoluteX="348dp"
70 
            tools:layout_editor_absoluteY="19dp" />
71 
    </android.support.constraint.ConstraintLayout>
72
73 
</android.support.constraint.ConstraintLayout>

+ 6 - 0
app/src/main/res/values/styles.xml
Bestand weergeven 

@ -6,6 +6,12 @@
6 6 
        <item name="colorAccent">@color/colorAccent</item>
7 7
8 8 
    </style>
9 
    <style name="BottomDialog" parent="@style/AppTheme">
10 
        <item name="android:layout_width">match_parent</item>
11 
        <item name="android:layout_height">wrap_content</item>
12 
        <item name="android:windowIsFloating">true</item>
13 
        <item name="android:windowSoftInputMode">stateAlwaysVisible</item><!--显示软件盘-->
14 
    </style>
9 15
10 16 
    <style name="actionBarTheme" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
11 17 
        <item name="android:textColorPrimary">@android:color/primary_text_light</item>

气泡详情页红包提示开发完成 · 1265adbc79 - Gogs: Go Git Service
Inicio Explorar Ayuda
Registro Iniciar sesión
dudu
/
cdzApp
Vigilar 2
Destacar 1
Fork 0
Código Incidencias 0 Pull Requests 0 Commits 199 Releases 18 Wiki
Explorar el Código

气泡详情页红包提示开发完成

huyuguo %!s(int64=6) %!d(string=hace) años
padre
0931eeb1d8
commit
1265adbc79
Se han modificado 8 ficheros con 154 adiciones y 119 borrados
Dividir vista Mostrar estadísticas de diff
  1. 4 0
      app/src/main/java/com/electric/chargingpile/fragment/DetailsFragment.java
  2. BIN
      app/src/main/res/drawable-hdpi/red_pager_bag_circle_icon.png
  3. BIN
      app/src/main/res/drawable-mdpi/red_pager_bag_circle_icon.png
  4. BIN
      app/src/main/res/drawable-xhdpi/red_pager_bag_circle_icon.png
  5. BIN
      app/src/main/res/drawable-xxhdpi/red_pager_bag_circle_icon.png
  6. BIN
      app/src/main/res/drawable-xxxhdpi/red_pager_bag_circle_icon.png
  7. 9 0
      app/src/main/res/drawable/red_paper_bag_shape.xml
  8. 141 119
      app/src/main/res/layout/fragmen_details_new.xml

+ 4 - 0
app/src/main/java/com/electric/chargingpile/fragment/DetailsFragment.java
Ver fichero 

@ -290,8 +290,10 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
290 290
291 291 
                        if ("1".equals(own_pay)) {
292 292 
                            getChartData();
293 
                            red_paper_bag_top.setVisibility(View.VISIBLE);
293 294 
                        } else {
294 295 
                            mChart.setVisibility(View.GONE);
296 
                            red_paper_bag_top.setVisibility(View.GONE);
295 297 
                        }
296 298
297 299 
@ -892,6 +894,7 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
892 894 
    private AlignTextView detail_park_cost;
893 895 
    private AlignTextView detail_remark;
894 896 
    private AlignTextView detail_zhan_name;
897 
    private LinearLayout red_paper_bag_top;
895 898 
    private AlignTextView detail_time;
896 899 
    public static TextView detail_list_num;
897 900 
    public static TextView detail_go_list;
 
@ -924,6 +927,7 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
924 927 
        detail_zhan_pic = (ImageView) v.findViewById(R.id.detail_zhan_pic);
925 928
926 929 
        detail_zhan_name = (AlignTextView) v.findViewById(R.id.detail_zhan_name);
930 
        red_paper_bag_top = v.findViewById(R.id.red_paper_bag_top);
927 931 
        detail_grade = (TextView) v.findViewById(R.id.detail_grade);
928 932 
        detail_picnum = (TextView) v.findViewById(R.id.detail_picnum);
929 933 
        detail_address = (TextView) v.findViewById(R.id.detail_address);

BIN
app/src/main/res/drawable-hdpi/red_pager_bag_circle_icon.png
Ver fichero


BIN
app/src/main/res/drawable-mdpi/red_pager_bag_circle_icon.png
Ver fichero


BIN
app/src/main/res/drawable-xhdpi/red_pager_bag_circle_icon.png
Ver fichero


BIN
app/src/main/res/drawable-xxhdpi/red_pager_bag_circle_icon.png
Ver fichero


BIN
app/src/main/res/drawable-xxxhdpi/red_pager_bag_circle_icon.png
Ver fichero


+ 9 - 0
app/src/main/res/drawable/red_paper_bag_shape.xml
Ver fichero 

@ -0,0 +1,9 @@
1 
<?xml version="1.0" encoding="utf-8"?>
2 
<shape xmlns:android="http://schemas.android.com/apk/res/android">
3 
    <!-- 背景色 -->
4 
    <solid android:color="#FFFBDE"></solid>
5 
    <!-- 边框颜色、宽度  -->
6 
    <stroke android:width="0.5dip" android:color="#FFE690"></stroke>
7 
    <!-- 边框圆角 -->
8 
    <corners android:radius="15dp"></corners>
9 
</shape>

+ 141 - 119
app/src/main/res/layout/fragmen_details_new.xml
Ver fichero 

@ -1,12 +1,12 @@
1 1 
<?xml version="1.0" encoding="utf-8"?>
2 2 
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 
    xmlns:zhy="http://schemas.android.com/tools"
4 3 
    xmlns:app="http://schemas.android.com/apk/res-auto"
5 4 
    xmlns:cb="http://schemas.android.com/apk/res-auto"
6 
    android:orientation="vertical"
5 
    xmlns:zhy="http://schemas.android.com/tools"
7 6 
    android:layout_width="match_parent"
8 7 
    android:layout_height="match_parent"
9 
    android:background="@color/white">
8 
    android:background="@color/white"
9 
    android:orientation="vertical">
10 10
11 11 
    <com.electric.chargingpile.view.CustomScrollView
12 12 
        android:layout_width="match_parent"
 
@ -17,12 +17,38 @@
17 17 
            android:layout_height="match_parent"
18 18 
            android:orientation="vertical">
19 19
20 
            <LinearLayout android:id="@+id/red_paper_bag_top"
21 
                android:layout_width="match_parent"
22 
                android:visibility="gone"
23 
                zhy:visibility="visible"
24 
                android:layout_height="30dp"
25 
                android:layout_marginLeft="15dp"
26 
                android:layout_marginTop="15dp"
27 
                android:layout_marginRight="15dp"
28 
                android:background="@drawable/red_paper_bag_shape"
29 
                android:gravity="center_vertical">
30
31 
                <ImageView
32 
                    android:layout_width="wrap_content"
33 
                    android:layout_height="wrap_content"
34 
                    android:layout_marginLeft="10dp"
35 
                    android:src="@drawable/red_pager_bag_circle_icon" />
36
37 
                <TextView
38 
                    android:layout_width="wrap_content"
39 
                    android:layout_height="wrap_content"
40 
                    android:layout_marginLeft="5dp"
41 
                    android:text="充电成功后评论并分享可以领红包喔～"
42 
                    android:textColor="#883B00"
43 
                    android:textSize="13sp" />
44 
            </LinearLayout>
45
20 46 
            <LinearLayout
21 47 
                android:layout_width="match_parent"
22 48 
                android:layout_height="wrap_content"
23 49 
                android:layout_marginLeft="15dp"
24 
                android:layout_marginRight="15dp"
25 
                android:layout_marginTop="20dp">
50 
                android:layout_marginTop="15dp"
51 
                android:layout_marginRight="15dp">
26 52
27 53 
                <me.codeboy.android.aligntextview.AlignTextView
28 54 
                    android:id="@+id/detail_zhan_name"
 
@ -45,37 +71,36 @@
45 71 
                    android:id="@+id/detail_private_or_public"
46 72 
                    android:layout_width="wrap_content"
47 73 
                    android:layout_height="14dp"
48 
                    android:src="@drawable/icon_detail_private"
49 
                    android:layout_gravity="center_vertical"/>
74 
                    android:layout_gravity="center_vertical"
75 
                    android:src="@drawable/icon_detail_private" />
50 76
51 77 
                <ImageView
52 78 
                    android:id="@+id/detail_up_or_down"
53 79 
                    android:layout_width="wrap_content"
54 80 
                    android:layout_height="14dp"
81 
                    android:layout_gravity="center_vertical"
55 82 
                    android:layout_marginLeft="2dp"
56 
                    android:src="@drawable/icon_detail_up"
57 
                    android:layout_gravity="center_vertical"/>
83 
                    android:src="@drawable/icon_detail_up" />
58 84
59 85 
                <TextView
60 86 
                    android:id="@+id/detail_grade"
61 87 
                    android:layout_width="wrap_content"
62 88 
                    android:layout_height="wrap_content"
63 
                    android:layout_marginLeft="4dp"
64 89 
                    android:layout_gravity="center_vertical"
90 
                    android:layout_marginLeft="4dp"
65 91 
                    android:text="2.0分"
66 
                    android:textSize="13sp"
67 
                    android:textColor="#ffa900"/>
92 
                    android:textColor="#ffa900"
93 
                    android:textSize="13sp" />
68 94
69 95 
            </LinearLayout>
70 96
71 97
72
73 98 
            <View
74 99 
                android:layout_width="match_parent"
75 100 
                android:layout_height="0.5dp"
76 
                android:background="#dddddd"
77 101 
                android:layout_marginLeft="15dp"
78 
                android:layout_marginTop="8dp"/>
102 
                android:layout_marginTop="8dp"
103 
                android:background="#dddddd" />
79 104
80 105 
            <RelativeLayout
81 106 
                android:layout_width="match_parent"
 
@ -86,16 +111,16 @@
86 111 
                    android:id="@+id/detail_zhan_pic"
87 112 
                    android:layout_width="96dp"
88 113 
                    android:layout_height="72dp"
89 
                    android:layout_marginLeft="15dp"
90 
                    android:layout_centerVertical="true"/>
114 
                    android:layout_centerVertical="true"
115 
                    android:layout_marginLeft="15dp" />
91 116
92 117 
                <TextView
93 118 
                    android:id="@+id/detail_picnum"
94 119 
                    android:layout_width="29dp"
95 120 
                    android:layout_height="18dp"
96 
                    android:layout_alignBottom="@+id/detail_zhan_pic"
97 121 
                    android:layout_alignEnd="@+id/detail_zhan_pic"
98 122 
                    android:layout_alignRight="@+id/detail_zhan_pic"
123 
                    android:layout_alignBottom="@+id/detail_zhan_pic"
99 124 
                    android:background="@drawable/bg_yinying531"
100 125 
                    android:gravity="center"
101 126 
                    android:text="0"
 
@ -107,36 +132,36 @@
107 132 
                    android:layout_width="wrap_content"
108 133 
                    android:layout_height="wrap_content"
109 134 
                    android:layout_alignTop="@+id/detail_zhan_pic"
110 
                    android:layout_toRightOf="@+id/detail_zhan_pic"
111 135 
                    android:layout_marginLeft="12dp"
112 
                    android:paddingRight="15dp"
136 
                    android:layout_toRightOf="@+id/detail_zhan_pic"
137 
                    android:ellipsize="end"
113 138 
                    android:gravity="left"
114 139 
                    android:maxLines="3"
115 
                    android:ellipsize="end"
140 
                    android:paddingRight="15dp"
116 141 
                    android:text=""
117 
                    android:textSize="14sp"
118 
                    android:textColor="@color/ui_62"/>
142 
                    android:textColor="@color/ui_62"
143 
                    android:textSize="14sp" />
119 144
120 145 
                <TextView
121 146 
                    android:id="@+id/detail_zhan_distance"
122 147 
                    android:layout_width="wrap_content"
123 148 
                    android:layout_height="wrap_content"
124 149 
                    android:layout_alignBottom="@+id/detail_zhan_pic"
125 
                    android:layout_toRightOf="@+id/detail_zhan_pic"
126 150 
                    android:layout_marginLeft="12dp"
127 
                    android:textSize="13sp"
128 
                    android:textColor="@color/ui_68"
151 
                    android:layout_toRightOf="@+id/detail_zhan_pic"
129 152 
                    android:drawableLeft="@drawable/icon_window_distance"
130 153 
                    android:drawablePadding="5dp"
154 
                    android:text="17.2km"
155 
                    android:textColor="@color/ui_68"
131 156
132 
                    android:text="17.2km"/>
157 
                    android:textSize="13sp" />
133 158 
            </RelativeLayout>
134 159
135 160 
            <View
136 161 
                android:layout_width="match_parent"
137 162 
                android:layout_height="0.5dp"
138 
                android:background="#dddddd"
139 
                android:layout_marginLeft="15dp" />
163 
                android:layout_marginLeft="15dp"
164 
                android:background="#dddddd" />
140 165
141 166 
            <LinearLayout
142 167 
                android:layout_width="match_parent"
 
@ -145,22 +170,22 @@
145 170
146 171 
                <RelativeLayout
147 172 
                    android:layout_width="0dp"
148 
                    android:layout_weight="1"
149 
                    android:layout_height="match_parent">
173 
                    android:layout_height="match_parent"
174 
                    android:layout_weight="1">
150 175
151 176 
                    <LinearLayout
152 177 
                        android:layout_width="wrap_content"
153 178 
                        android:layout_height="wrap_content"
154 
                        android:orientation="horizontal"
155 
                        android:layout_centerInParent="true">
179 
                        android:layout_centerInParent="true"
180 
                        android:orientation="horizontal">
156 181
157 182 
                        <TextView
158 183 
                            android:layout_width="wrap_content"
159 184 
                            android:layout_height="wrap_content"
160 185 
                            android:layout_gravity="center"
161 
                            android:textSize="12sp"
186 
                            android:text="快充"
162 187 
                            android:textColor="@color/ui_68"
163 
                            android:text="快充"/>
188 
                            android:textSize="12sp" />
164 189
165 190 
                        <TextView
166 191 
                            android:id="@+id/detail_fast_num"
 
@ -168,9 +193,9 @@
168 193 
                            android:layout_height="wrap_content"
169 194 
                            android:layout_gravity="center"
170 195 
                            android:layout_marginLeft="13dp"
171 
                            android:textSize="21sp"
196 
                            android:text=""
172 197 
                            android:textColor="@color/ui_62"
173 
                            android:text=""/>
198 
                            android:textSize="21sp" />
174 199
175 200 
                        <TextView
176 201 
                            android:id="@+id/detail_fastable"
 
@ -178,10 +203,10 @@
178 203 
                            android:layout_height="wrap_content"
179 204 
                            android:layout_gravity="center"
180 205 
                            android:layout_marginLeft="24dp"
181 
                            android:textSize="12sp"
182 
                            android:textColor="@color/ui_68"
183 206 
                            android:text="空闲"
184 
                            android:visibility="visible"/>
207 
                            android:textColor="@color/ui_68"
208 
                            android:textSize="12sp"
209 
                            android:visibility="visible" />
185 210
186 211 
                        <TextView
187 212 
                            android:id="@+id/detail_fastable_num"
 
@ -189,10 +214,10 @@
189 214 
                            android:layout_height="wrap_content"
190 215 
                            android:layout_gravity="center"
191 216 
                            android:layout_marginLeft="13dp"
192 
                            android:textSize="21sp"
193 
                            android:textColor="@color/ui_62"
194 217 
                            android:text=""
195 
                            android:visibility="visible"/>
218 
                            android:textColor="@color/ui_62"
219 
                            android:textSize="21sp"
220 
                            android:visibility="visible" />
196 221
197 222
198 223 
                    </LinearLayout>
 
@ -202,27 +227,27 @@
202 227 
                <View
203 228 
                    android:layout_width="0.5dp"
204 229 
                    android:layout_height="18dp"
205 
                    android:background="#dddddd"
206 
                    android:layout_gravity="center"/>
230 
                    android:layout_gravity="center"
231 
                    android:background="#dddddd" />
207 232
208 233 
                <RelativeLayout
209 234 
                    android:layout_width="0dp"
210 
                    android:layout_weight="1"
211 
                    android:layout_height="match_parent">
235 
                    android:layout_height="match_parent"
236 
                    android:layout_weight="1">
212 237
213 238 
                    <LinearLayout
214 239 
                        android:layout_width="wrap_content"
215 240 
                        android:layout_height="wrap_content"
216 
                        android:orientation="horizontal"
217 
                        android:layout_centerInParent="true">
241 
                        android:layout_centerInParent="true"
242 
                        android:orientation="horizontal">
218 243
219 244 
                        <TextView
220 245 
                            android:layout_width="wrap_content"
221 246 
                            android:layout_height="wrap_content"
222 247 
                            android:layout_gravity="center"
223 
                            android:textSize="12sp"
248 
                            android:text="慢充"
224 249 
                            android:textColor="@color/ui_68"
225 
                            android:text="慢充"/>
250 
                            android:textSize="12sp" />
226 251
227 252 
                        <TextView
228 253 
                            android:id="@+id/detail_slow_num"
 
@ -230,9 +255,9 @@
230 255 
                            android:layout_height="wrap_content"
231 256 
                            android:layout_gravity="center"
232 257 
                            android:layout_marginLeft="13dp"
233 
                            android:textSize="21sp"
258 
                            android:text=""
234 259 
                            android:textColor="@color/ui_62"
235 
                            android:text=""/>
260 
                            android:textSize="21sp" />
236 261
237 262 
                        <TextView
238 263 
                            android:id="@+id/detail_slowable"
 
@ -240,10 +265,10 @@
240 265 
                            android:layout_height="wrap_content"
241 266 
                            android:layout_gravity="center"
242 267 
                            android:layout_marginLeft="24dp"
243 
                            android:textSize="12sp"
244 
                            android:textColor="@color/ui_68"
245 268 
                            android:text="空闲"
246 
                            android:visibility="visible"/>
269 
                            android:textColor="@color/ui_68"
270 
                            android:textSize="12sp"
271 
                            android:visibility="visible" />
247 272
248 273 
                        <TextView
249 274 
                            android:id="@+id/detail_slowable_num"
 
@ -251,10 +276,10 @@
251 276 
                            android:layout_height="wrap_content"
252 277 
                            android:layout_gravity="center"
253 278 
                            android:layout_marginLeft="13dp"
254 
                            android:textSize="21sp"
255 
                            android:textColor="@color/ui_62"
256 279 
                            android:text=""
257 
                            android:visibility="visible"/>
280 
                            android:textColor="@color/ui_62"
281 
                            android:textSize="21sp"
282 
                            android:visibility="visible" />
258 283
259 284 
                    </LinearLayout>
260 285 
@ -265,7 +290,7 @@
265 290 
            <View
266 291 
                android:layout_width="match_parent"
267 292 
                android:layout_height="10dp"
268 
                android:background="@color/ui_f4"/>
293 
                android:background="@color/ui_f4" />
269 294
270 295 
            <RelativeLayout
271 296 
                android:layout_width="match_parent"
 
@ -288,10 +313,10 @@
288 313 
                    android:id="@+id/detail_cost"
289 314 
                    android:layout_width="wrap_content"
290 315 
                    android:layout_height="wrap_content"
291 
                    android:layout_alignParentBottom="true"
292 316 
                    android:layout_alignParentLeft="true"
293 
                    android:layout_marginBottom="15dp"
317 
                    android:layout_alignParentBottom="true"
294 318 
                    android:layout_marginLeft="15dp"
319 
                    android:layout_marginBottom="15dp"
295 320 
                    android:drawablePadding="11dp"
296 321 
                    android:text=""
297 322 
                    android:textColor="@color/ui_62"
 
@ -323,8 +348,8 @@
323 348 
            <View
324 349 
                android:layout_width="match_parent"
325 350 
                android:layout_height="0.5dp"
326 
                android:background="#dddddd"
327 
                android:layout_marginLeft="15dp" />
351 
                android:layout_marginLeft="15dp"
352 
                android:background="#dddddd" />
328 353
329 354 
            <LinearLayout
330 355 
                android:layout_width="match_parent"
 
@ -356,13 +381,13 @@
356 381 
                            android:layout_width="wrap_content"
357 382 
                            android:layout_height="wrap_content"
358 383 
                            android:layout_alignParentRight="true"
359 
                            android:layout_toRightOf="@+id/tv1"
360 384 
                            android:layout_marginLeft="20dp"
385 
                            android:layout_toRightOf="@+id/tv1"
361 386 
                            android:gravity="right"
362 
                            cb:align="right"
363 387 
                            android:text=""
364 388 
                            android:textColor="@color/ui_65"
365 
                            android:textSize="14sp" />
389 
                            android:textSize="14sp"
390 
                            cb:align="right" />
366 391
367 392 
                    </RelativeLayout>
368 393 
@ -492,15 +517,15 @@
492 517 
                        android:id="@+id/detail_park_cost"
493 518 
                        android:layout_width="wrap_content"
494 519 
                        android:layout_height="wrap_content"
520 
                        android:layout_alignParentTop="true"
495 521 
                        android:layout_alignParentRight="true"
522 
                        android:layout_marginLeft="20dp"
496 523 
                        android:layout_toRightOf="@+id/tv2"
497 524 
                        android:gravity="right"
498 
                        android:layout_marginLeft="20dp"
499 
                        android:layout_alignParentTop="true"
500 525 
                        android:text=""
501 
                        cb:align="right"
502 526 
                        android:textColor="@color/ui_65"
503 
                        android:textSize="14sp" />
527 
                        android:textSize="14sp"
528 
                        cb:align="right" />
504 529
505 530 
                </RelativeLayout>
506 531 
@ -522,15 +547,15 @@
522 547 
                        android:id="@+id/detail_time"
523 548 
                        android:layout_width="wrap_content"
524 549 
                        android:layout_height="wrap_content"
550 
                        android:layout_alignParentTop="true"
525 551 
                        android:layout_alignParentRight="true"
552 
                        android:layout_marginLeft="20dp"
526 553 
                        android:layout_toRightOf="@+id/tv3"
527 554 
                        android:gravity="right"
528 
                        android:layout_marginLeft="20dp"
529 
                        android:layout_alignParentTop="true"
530 555 
                        android:text=""
531 
                        cb:align="right"
532 556 
                        android:textColor="@color/ui_65"
533 
                        android:textSize="14sp" />
557 
                        android:textSize="14sp"
558 
                        cb:align="right" />
534 559
535 560 
                </RelativeLayout>
536 561 
@ -539,7 +564,7 @@
539 564 
            <View
540 565 
                android:layout_width="match_parent"
541 566 
                android:layout_height="10dp"
542 
                android:background="@color/ui_f4"/>
567 
                android:background="@color/ui_f4" />
543 568
544 569 
            <LinearLayout
545 570 
                android:layout_width="match_parent"
 
@ -550,31 +575,31 @@
550 575 
                    android:id="@+id/tv_today_num"
551 576 
                    android:layout_width="wrap_content"
552 577 
                    android:layout_height="wrap_content"
553 
                    android:layout_alignParentTop="true"
554 578 
                    android:layout_alignParentLeft="true"
579 
                    android:layout_alignParentTop="true"
555 580 
                    android:layout_marginLeft="15dp"
556 581 
                    android:layout_marginTop="15dp"
557 
                    android:drawablePadding="11dp"
558 582 
                    android:drawableLeft="@drawable/icon_detail_chargelist"
583 
                    android:drawablePadding="11dp"
559 584 
                    android:text="充电记录"
560 
                    android:textSize="15sp"
561 
                    android:textColor="@color/ui_62"/>
585 
                    android:textColor="@color/ui_62"
586 
                    android:textSize="15sp" />
562 587
563 588 
                <com.github.mikephil.charting.charts.CombinedChart
564 589 
                    android:id="@+id/chart1"
565 590 
                    android:layout_width="match_parent"
566 
                    android:layout_marginTop="10dp"
591 
                    android:layout_height="150dp"
567 592 
                    android:layout_marginLeft="16dp"
568 
                    android:layout_marginRight="16dp"
569 
                    android:layout_height="150dp" />
593 
                    android:layout_marginTop="10dp"
594 
                    android:layout_marginRight="16dp" />
570 595
571 596 
                <RelativeLayout
572 597 
                    android:layout_width="match_parent"
573 598 
                    android:layout_height="wrap_content"
574 599 
                    android:layout_marginLeft="15dp"
575 600 
                    android:layout_marginRight="15dp"
576 
                    android:paddingBottom="15dp"
577 
                    android:paddingTop="15dp">
601 
                    android:paddingTop="15dp"
602 
                    android:paddingBottom="15dp">
578 603
579 604 
                    <TextView
580 605 
                        android:id="@+id/detail_list_num"
 
@ -582,32 +607,30 @@
582 607 
                        android:layout_height="wrap_content"
583 608 
                        android:layout_alignParentLeft="true"
584 609 
                        android:text="已有-位车主发布车型记录"
585 
                        android:textSize="14sp"
586 
                        android:textColor="@color/ui_65"/>
610 
                        android:textColor="@color/ui_65"
611 
                        android:textSize="14sp" />
587 612
588 613 
                    <TextView
589 614 
                        android:id="@+id/detail_charging_enter"
590 615 
                        android:layout_width="wrap_content"
591 616 
                        android:layout_height="wrap_content"
592 617 
                        android:layout_alignParentRight="true"
593 
                        android:text="前往查看"
594 618 
                        android:drawableRight="@drawable/icon_charging_more"
595 619 
                        android:drawablePadding="4dp"
596 
                        android:textSize="14sp"
597 
                        android:textColor="@color/lvse"/>
620 
                        android:text="前往查看"
621 
                        android:textColor="@color/lvse"
622 
                        android:textSize="14sp" />
598 623
599 624 
                </RelativeLayout>
600 625
601 626
602
603
604 627 
            </LinearLayout>
605 628
606 629 
            <View
607 630 
                android:id="@+id/detail_view"
608 631 
                android:layout_width="match_parent"
609 632 
                android:layout_height="10dp"
610 
                android:background="@color/ui_f4"/>
633 
                android:background="@color/ui_f4" />
611 634
612 635 
            <LinearLayout
613 636 
                android:id="@+id/detail_claimer_remark"
 
@ -618,27 +641,27 @@
618 641 
                <TextView
619 642 
                    android:layout_width="wrap_content"
620 643 
                    android:layout_height="wrap_content"
621 
                    android:layout_alignParentTop="true"
622 644 
                    android:layout_alignParentLeft="true"
645 
                    android:layout_alignParentTop="true"
623 646 
                    android:layout_marginLeft="15dp"
624 647 
                    android:layout_marginTop="15dp"
625 648 
                    android:drawableLeft="@drawable/icon_detail_remark"
626 649 
                    android:drawablePadding="11dp"
627 650 
                    android:text="备注"
628 
                    android:textSize="15sp"
629 
                    android:textColor="@color/ui_62"/>
651 
                    android:textColor="@color/ui_62"
652 
                    android:textSize="15sp" />
630 653
631 654 
                <me.codeboy.android.aligntextview.AlignTextView
632 655 
                    android:id="@+id/detail_remark"
633 656 
                    android:layout_width="wrap_content"
634 657 
                    android:layout_height="wrap_content"
635 
                    android:layout_marginRight="15dp"
636 
                    android:layout_marginTop="8dp"
637 658 
                    android:layout_marginLeft="42dp"
659 
                    android:layout_marginTop="8dp"
660 
                    android:layout_marginRight="15dp"
638 661 
                    android:layout_marginBottom="15dp"
639 662 
                    android:text=""
640 
                    android:textSize="14sp"
641 
                    android:textColor="@color/ui_65"/>
663 
                    android:textColor="@color/ui_65"
664 
                    android:textSize="14sp" />
642 665
643 666
644 667 
            </LinearLayout>
 
@ -646,7 +669,7 @@
646 669 
            <View
647 670 
                android:layout_width="match_parent"
648 671 
                android:layout_height="10dp"
649 
                android:background="@color/ui_f4"/>
672 
                android:background="@color/ui_f4" />
650 673
651 674 
            <RelativeLayout
652 675 
                android:id="@+id/rl_new_comment"
 
@ -670,11 +693,11 @@
670 693 
                <TextView
671 694 
                    android:layout_width="wrap_content"
672 695 
                    android:layout_height="wrap_content"
673 
                    android:layout_alignParentRight="true"
674 696 
                    android:layout_alignTop="@+id/tv_new"
675 
                    android:text="查看所有评论"
697 
                    android:layout_alignParentRight="true"
676 698 
                    android:drawableRight="@drawable/icon_detail_more"
677 699 
                    android:drawablePadding="5dp"
700 
                    android:text="查看所有评论"
678 701 
                    android:textColor="@color/ui_68"
679 702 
                    android:textSize="14sp" />
680 703 
@ -682,9 +705,9 @@
682 705 
                    android:id="@+id/rl_icon"
683 706 
                    android:layout_width="35dp"
684 707 
                    android:layout_height="35dp"
685 
                    android:layout_alignParentLeft="true"
686 
                    android:layout_alignParentStart="true"
687 708 
                    android:layout_below="@+id/tv_new"
709 
                    android:layout_alignParentStart="true"
710 
                    android:layout_alignParentLeft="true"
688 711 
                    android:layout_gravity="center_vertical"
689 712 
                    android:layout_marginTop="10dp">
690 713 
@ -699,14 +722,13 @@
699 722 
                        android:id="@+id/iv_level_img"
700 723 
                        android:layout_width="15dp"
701 724 
                        android:layout_height="15dp"
702 
                        android:layout_alignParentBottom="true"
703 
                        android:layout_alignParentRight="true"/>
725 
                        android:layout_alignParentRight="true"
726 
                        android:layout_alignParentBottom="true" />
704 727
705 728
706 729 
                </RelativeLayout>
707 730
708 731
709
710 732 
                <TextView
711 733 
                    android:id="@+id/tv_new_name"
712 734 
                    android:layout_width="wrap_content"
 
@ -739,8 +761,8 @@
739 761 
                    android:id="@+id/iv_new_pingfen"
740 762 
                    android:layout_width="wrap_content"
741 763 
                    android:layout_height="wrap_content"
742 
                    android:layout_alignParentRight="true"
743 764 
                    android:layout_alignTop="@+id/tv_new_name"
765 
                    android:layout_alignParentRight="true"
744 766 
                    android:layout_gravity="center_vertical"
745 767 
                    android:src="@drawable/icon_5xing"
746 768 
                    android:textAppearance="?android:attr/textAppearanceSmall" />
 
@ -749,11 +771,11 @@
749 771 
                    android:id="@+id/tv_new_comment"
750 772 
                    android:layout_width="wrap_content"
751 773 
                    android:layout_height="wrap_content"
752 
                    android:layout_alignLeft="@+id/tv_new_name"
753 
                    android:layout_alignStart="@+id/tv_new_name"
754 774 
                    android:layout_below="@+id/tv_new_name"
755 
                    android:layout_marginRight="15dp"
775 
                    android:layout_alignStart="@+id/tv_new_name"
776 
                    android:layout_alignLeft="@+id/tv_new_name"
756 777 
                    android:layout_marginTop="10dp"
778 
                    android:layout_marginRight="15dp"
757 779 
                    android:text=""
758 780 
                    android:textAppearance="?android:attr/textAppearanceSmall"
759 781 
                    android:textSize="15sp"
 
@ -763,32 +785,32 @@
763 785 
                    android:id="@+id/id_flowlayout_activity"
764 786 
                    android:layout_width="fill_parent"
765 787 
                    android:layout_height="wrap_content"
766 
                    android:layout_alignLeft="@+id/tv_new_comment"
767 788 
                    android:layout_below="@+id/tv_new_comment"
789 
                    android:layout_alignLeft="@+id/tv_new_comment"
768 790 
                    android:layout_marginTop="10dp"
769 791 
                    zhy:max_select="-1">
770 792
771 793 
                </com.zhy.view.flowlayout.TagFlowLayout>
772 794
773 795 
                <ImageView
796 
                    android:id="@+id/iv_commentPic"
774 797 
                    android:layout_width="65dp"
775 798 
                    android:layout_height="65dp"
776 
                    android:id="@+id/iv_commentPic"
777 
                    android:layout_marginTop="10dp"
778 799 
                    android:layout_below="@+id/id_flowlayout_activity"
779 800 
                    android:layout_alignLeft="@+id/tv_new_comment"
801 
                    android:layout_marginTop="10dp"
780 802 
                    android:scaleType="centerCrop"
781 
                    android:visibility="gone"/>
803 
                    android:visibility="gone" />
782 804
783 805 
                <TextView
784 806 
                    android:id="@+id/tv_new_time"
785 807 
                    android:layout_width="wrap_content"
786 808 
                    android:layout_height="wrap_content"
787 
                    android:layout_alignLeft="@+id/tv_new_comment"
788 
                    android:layout_alignStart="@+id/tv_new_comment"
789 809 
                    android:layout_below="@+id/iv_commentPic"
790 
                    android:layout_marginBottom="8dp"
810 
                    android:layout_alignStart="@+id/tv_new_comment"
811 
                    android:layout_alignLeft="@+id/tv_new_comment"
791 812 
                    android:layout_marginTop="10dp"
813 
                    android:layout_marginBottom="8dp"
792 814 
                    android:text="15分钟前"
793 815 
                    android:textAppearance="?android:attr/textAppearanceSmall"
794 816 
                    android:textColor="@color/ui_68"