Pārlūkot izejas kodu

个人信息跳过添加完成

huyuguo 3 gadi atpakaļ
vecāks
revīzija
2f57a882f5

+ 1 - 0
app/src/main/java/com/electric/chargingpile/activity/MainMapActivity.java

@ -939,6 +939,7 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
939 939
        }, 2000);
940 940
941 941
//        startActivity(new Intent(getApplication(), ChargingStatusActivity.class));
942
//        startActivity(new Intent(this, SkipUserInfoActivity.class));
942 943
    }
943 944
944 945

+ 1 - 1
app/src/main/java/com/electric/chargingpile/activity/RegisterActivity.java

@ -613,7 +613,7 @@ public class RegisterActivity extends Activity implements OnClickListener {
613 613
                        new Handler().postDelayed(new Runnable() {
614 614
                            public void run() {
615 615
                                ActivityManagerApplication.destoryActivity("login");
616
//                                startActivity(new Intent(RegisterActivity.this, SkipUserInfoActivity.class));
616
                                startActivity(new Intent(RegisterActivity.this, SkipUserInfoActivity.class));
617 617
                                finish();
618 618
                            }
619 619
                        }, 1200);

+ 115 - 3
app/src/main/java/com/electric/chargingpile/activity/SkipUserInfoActivity.java

@ -14,7 +14,6 @@ import android.os.Environment;
14 14
import android.os.Handler;
15 15
import android.os.Message;
16 16
import android.provider.MediaStore;
17
import androidx.core.content.FileProvider;
18 17
import android.text.TextUtils;
19 18
import android.util.Log;
20 19
import android.view.Gravity;
@ -37,16 +36,21 @@ import android.widget.TextView;
37 36
import android.widget.Toast;
38 37
import android.widget.ToggleButton;
39 38
39
import androidx.core.content.FileProvider;
40
40 41
import com.electric.chargingpile.R;
41 42
import com.electric.chargingpile.application.MainApplication;
43
import com.electric.chargingpile.data.CarOwnerCertificateBean;
42 44
import com.electric.chargingpile.data.Cars;
43 45
import com.electric.chargingpile.data.Province;
46
import com.electric.chargingpile.entity.CarSeriesEntity;
44 47
import com.electric.chargingpile.manager.ProfileManager;
45 48
import com.electric.chargingpile.util.ActivityManagerApplication;
46 49
import com.electric.chargingpile.util.BarColorUtil;
47 50
import com.electric.chargingpile.util.DES3;
48 51
import com.electric.chargingpile.util.ImageTools;
49 52
import com.electric.chargingpile.util.JsonUtils;
53
import com.electric.chargingpile.util.LoadingDialog;
50 54
import com.electric.chargingpile.util.LogUtils;
51 55
import com.electric.chargingpile.util.OkHttpUtil;
52 56
import com.electric.chargingpile.util.PhotoUtils;
@ -55,8 +59,11 @@ import com.electric.chargingpile.util.UploadUtil;
55 59
import com.electric.chargingpile.view.CustomProgressDialog;
56 60
import com.electric.chargingpile.view.RoundImageView;
57 61
import com.electric.chargingpile.view.xrichtext.SDCardUtil;
62
import com.google.gson.Gson;
58 63
import com.squareup.okhttp.Request;
59 64
import com.squareup.okhttp.Response;
65
import com.zhy.http.okhttp.OkHttpUtils;
66
import com.zhy.http.okhttp.callback.StringCallback;
60 67
61 68
import org.json.JSONArray;
62 69
import org.json.JSONException;
@ -65,11 +72,13 @@ import org.json.JSONObject;
65 72
import java.io.ByteArrayOutputStream;
66 73
import java.io.File;
67 74
import java.io.IOException;
75
import java.net.URLEncoder;
68 76
import java.util.ArrayList;
69 77
import java.util.HashMap;
70 78
import java.util.List;
71 79
import java.util.Map;
72 80
81
import okhttp3.Call;
73 82
import pub.devrel.easypermissions.AfterPermissionGranted;
74 83
import pub.devrel.easypermissions.EasyPermissions;
75 84
@ -117,6 +126,14 @@ public class SkipUserInfoActivity extends Activity implements View.OnClickListen
117 126
    private static final int RC_CAMERA_PERM = 123;
118 127
    private SkipUserInfoActivity activity;
119 128
129
    private LoadingDialog loadDialog;
130
    // 1.去认证车主(获得充电优惠)      > 2.认证车主             审核中  3.认证车主             宝马
131
    private int certificateStatus = 0; // 1 去认证  2审核中  3认证车主
132
    private RelativeLayout go_certificate;
133
    private TextView go_title;
134
    private TextView go_desc;
135
    private ImageView go_cursor;
136
120 137
    @Override
121 138
    protected void onCreate(Bundle savedInstanceState) {
122 139
        super.onCreate(savedInstanceState);
@ -130,6 +147,7 @@ public class SkipUserInfoActivity extends Activity implements View.OnClickListen
130 147
    }
131 148
132 149
    private void initView() {
150
        loadDialog = new LoadingDialog(this);
133 151
        rl_point = (RelativeLayout) findViewById(R.id.rl_point);
134 152
        tv_point = (TextView) findViewById(R.id.tv_point);
135 153
@ -184,6 +202,13 @@ public class SkipUserInfoActivity extends Activity implements View.OnClickListen
184 202
        tv_skip = (TextView) findViewById(R.id.iv_right);
185 203
        tv_skip.setOnClickListener(this);
186 204
205
        go_certificate = findViewById(R.id.go_certificate);
206
        go_certificate.setOnClickListener(this);
207
        go_title = findViewById(R.id.go_title);
208
        go_desc = findViewById(R.id.go_desc);
209
        go_cursor = findViewById(R.id.go_cursor);
210
211
        getCarOwnerCertificateList(false);
187 212
    }
188 213
189 214
    private void spinner() {
@ -441,8 +466,14 @@ public class SkipUserInfoActivity extends Activity implements View.OnClickListen
441 466
                    }).start();
442 467
                    createDialog();
443 468
                }
444
445
469
                break;
470
            case R.id.go_certificate:
471
                // 1 去认证  2审核中  3认证车主
472
                if (certificateStatus == 0) {
473
                    getCarOwnerCertificateList(true);
474
                } else if (certificateStatus == 1) {
475
                    startActivity(new Intent(getApplication(), CarOwnerCertificateActivity.class));
476
                }
446 477
                break;
447 478
448 479
        }
@ -874,4 +905,85 @@ public class SkipUserInfoActivity extends Activity implements View.OnClickListen
874 905
875 906
    }
876 907
908
    private void getCarOwnerCertificateList(Boolean showLoading) {
909
        if (showLoading) {
910
            loadDialog.show();
911
        }
912
913
        long tokenTime = System.currentTimeMillis() / 1000 - MainMapActivity.cha - 1;
914
        String token = null;
915
        try {
916
            token = DES3.encode(String.valueOf(tokenTime));
917
            token = URLEncoder.encode(token, "UTF-8");
918
        } catch (Exception e) {
919
            e.printStackTrace();
920
        }
921
922
        String url = MainApplication.url + "/zhannew/basic/web/index.php/car/my?userid=" + MainApplication.userId + "&order=1" + "&token=" + token;
923
        OkHttpUtils.get().url(url).build().connTimeOut(6000).readTimeOut(6000).execute(new StringCallback() {
924
            @Override
925
            public void onError(Call call, Exception e) {
926
                e.printStackTrace();
927
                loadDialog.dismiss();
928
                Toast.makeText(getApplicationContext(), e.getLocalizedMessage(), Toast.LENGTH_SHORT).show();
929
                go_title.setText("去认证车主(获得充电优惠)");
930
                go_desc.setText("");
931
                go_cursor.setVisibility(View.VISIBLE);
932
            }
933
934
            @Override
935
            public void onResponse(String response) {
936
                loadDialog.dismiss();
937
                String rtnCode = JsonUtils.getKeyResult(response, "rtnCode");
938
                if ("01".equals(rtnCode)) {
939
                    String data = JsonUtils.getKeyResult(response, "data");
940
                    List<CarOwnerCertificateBean> list = JsonUtils.parseToObjectList(data, CarOwnerCertificateBean.class);
941
                    CarSeriesEntity carSeriesEntity = null;
942
                    // 1 去认证  2审核中  3认证车主
943
                    if (list.size() == 0) {
944
                        certificateStatus = 1;
945
                    } else {
946
                        certificateStatus = 2;
947
                        for (CarOwnerCertificateBean bean : list) {
948
                            if (bean.getStatus() == 1 && bean.getMain() == 1) {
949
                                certificateStatus = 3;
950
                                Gson gson = new Gson();
951
                                carSeriesEntity = gson.fromJson(bean.getChexing(), CarSeriesEntity.class);
952
                                break;
953
                            }
954
                        }
955
                    }
956
957
                    if (certificateStatus == 2) {
958
                        go_title.setText("认证车主");
959
                        go_desc.setText("审核中");
960
                        go_cursor.setVisibility(View.GONE);
961
                    } else if (certificateStatus == 3) {
962
                        go_title.setText("认证车主");
963
                        if (carSeriesEntity != null) {
964
                            go_desc.setText(carSeriesEntity.getSeriesName());
965
                        }
966
                        go_cursor.setVisibility(View.GONE);
967
                    } else {
968
                        go_title.setText("去认证车主(获得充电优惠)");
969
                        go_desc.setText("");
970
                        go_cursor.setVisibility(View.VISIBLE);
971
                    }
972
973
                    if (certificateStatus == 1 && showLoading) {
974
                        startActivity(new Intent(getApplication(), CarOwnerCertificateActivity.class));
975
                    }
976
977
                } else {
978
                    String rtnMsg = JsonUtils.getKeyResult(response, "rtnMsg");
979
                    Toast.makeText(getApplicationContext(), rtnMsg, Toast.LENGTH_SHORT).show();
980
981
                    go_title.setText("去认证车主(获得充电优惠)");
982
                    go_desc.setText("");
983
                    go_cursor.setVisibility(View.VISIBLE);
984
                }
985
            }
986
        });
987
    }
988
877 989
}

+ 178 - 130
app/src/main/res/layout/activity_skip_user_info.xml

@ -1,5 +1,6 @@
1 1
<?xml version="1.0" encoding="utf-8"?>
2 2
<com.zhy.autolayout.AutoLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3
    xmlns:tools="http://schemas.android.com/tools"
3 4
    android:layout_width="match_parent"
4 5
    android:layout_height="match_parent"
5 6
    android:orientation="vertical">
@ -16,10 +17,10 @@
16 17
            android:layout_alignParentLeft="true"
17 18
            android:layout_centerVertical="true"
18 19
            android:contentDescription="@null"
19
            android:paddingBottom="4px"
20 20
            android:paddingLeft="16dp"
21
            android:paddingRight="16dp"
22 21
            android:paddingTop="4px"
22
            android:paddingRight="16dp"
23
            android:paddingBottom="4px"
23 24
            android:src="@drawable/icon_lvback1119" />
24 25
25 26
        <TextView
@ -35,22 +36,21 @@
35 36
            android:id="@+id/iv_right"
36 37
            android:layout_width="wrap_content"
37 38
            android:layout_height="match_parent"
38
            android:paddingBottom="4dp"
39
            android:layout_alignParentTop="true"
40
            android:layout_alignParentEnd="true"
41
            android:layout_alignParentRight="true"
42
            android:gravity="center"
39 43
            android:paddingLeft="16dp"
40
            android:paddingRight="16dp"
41 44
            android:paddingTop="4dp"
42
            android:textSize="15sp"
43
            android:visibility="visible"
45
            android:paddingRight="16dp"
46
            android:paddingBottom="4dp"
44 47
            android:text="跳过"
45
            android:gravity="center"
46 48
            android:textColor="@color/lvse"
47
            android:layout_alignParentTop="true"
48
            android:layout_alignParentRight="true"
49
            android:layout_alignParentEnd="true" />
49
            android:textSize="15sp"
50
            android:visibility="visible" />
50 51
    </RelativeLayout>
51 52
52 53
53
54 54
    <LinearLayout
55 55
        android:layout_width="match_parent"
56 56
        android:layout_height="0dp"
@ -75,27 +75,28 @@
75 75
            <RelativeLayout
76 76
                android:id="@+id/rl_icon"
77 77
                android:layout_width="fill_parent"
78
                android:background="@color/white"
79
                android:layout_height="62dp">
78
                android:layout_height="62dp"
79
                android:background="@color/white">
80
80 81
                <TextView
81 82
                    android:layout_width="wrap_content"
82 83
                    android:layout_height="match_parent"
84
                    android:gravity="center"
85
                    android:paddingLeft="16dp"
83 86
                    android:text="头像"
84 87
                    android:textColor="@color/title_row"
85
                    android:textSize="15sp"
86
                    android:paddingLeft="16dp"
87
                    android:gravity="center"/>
88
                    android:textSize="15sp" />
88 89
89 90
                <com.electric.chargingpile.view.RoundImageView
90 91
                    android:id="@+id/iv_user_icon"
91 92
                    android:layout_width="45dp"
92 93
                    android:layout_height="45dp"
93
                    android:src="@drawable/icon_face2_0"
94
                    android:layout_centerVertical="true"
95
                    android:layout_alignParentRight="true"
96 94
                    android:layout_alignParentEnd="true"
95
                    android:layout_alignParentRight="true"
96
                    android:layout_centerVertical="true"
97
                    android:layout_marginEnd="32dp"
97 98
                    android:layout_marginRight="32dp"
98
                    android:layout_marginEnd="32dp" />
99
                    android:src="@drawable/icon_face2_0" />
99 100
                <!--<ImageView-->
100 101
                <!--android:id="@+id/iv_user_icon"-->
101 102
                <!--android:layout_width="55dp"-->
@ -109,15 +110,15 @@
109 110
                <ImageView
110 111
                    android:layout_width="wrap_content"
111 112
                    android:layout_height="match_parent"
112
                    android:src="@drawable/icon_more2_0"
113
                    android:layout_centerVertical="true"
114
                    android:layout_alignParentRight="true"
115 113
                    android:layout_alignParentEnd="true"
116
                    android:layout_marginRight="16dp" />
117
114
                    android:layout_alignParentRight="true"
115
                    android:layout_centerVertical="true"
116
                    android:layout_marginRight="16dp"
117
                    android:src="@drawable/icon_more2_0" />
118 118
119 119
120 120
            </RelativeLayout>
121
121 122
            <View
122 123
                android:layout_width="match_parent"
123 124
                android:layout_height="0.5dp"
@ -126,82 +127,130 @@
126 127
127 128
            <RelativeLayout
128 129
                android:layout_width="fill_parent"
129
                android:background="@color/white"
130
                android:layout_height="45dp">
130
                android:layout_height="45dp"
131
                android:background="@color/white">
132
131 133
                <TextView
132 134
                    android:layout_width="wrap_content"
133 135
                    android:layout_height="match_parent"
136
                    android:gravity="center"
137
                    android:paddingLeft="16dp"
134 138
                    android:text="昵称"
135 139
                    android:textColor="@color/title_row"
136
                    android:textSize="15sp"
137
                    android:paddingLeft="16dp"
138
                    android:gravity="center"/>
140
                    android:textSize="15sp" />
139 141
140 142
                <EditText
141 143
                    android:id="@+id/et_nickName"
142 144
                    android:layout_width="wrap_content"
143 145
                    android:layout_height="match_parent"
146
                    android:layout_alignParentTop="true"
147
                    android:layout_alignParentEnd="true"
148
                    android:layout_alignParentRight="true"
149
                    android:layout_marginRight="16dp"
144 150
                    android:background="@color/white"
145
                    android:hint="请输入昵称"
146 151
                    android:gravity="center|right"
152
                    android:hint="请输入昵称"
147 153
                    android:singleLine="true"
148
                    android:textColorHint="@color/hintColor"
149 154
                    android:textColor="@color/ui_62"
150
                    android:textSize="15sp"
151
                    android:layout_alignParentTop="true"
152
                    android:layout_alignParentRight="true"
153
                    android:layout_alignParentEnd="true"
154
                    android:layout_marginRight="16dp" />
155
                    android:textColorHint="@color/hintColor"
156
                    android:textSize="15sp" />
155 157
156 158
            </RelativeLayout>
157 159
158 160
            <View
159 161
                android:layout_width="match_parent"
160 162
                android:layout_height="0.5dp"
161
                android:background="@color/ui_line"
162 163
                android:layout_marginLeft="16dp"
163
                android:visibility="visible"/>
164
                android:background="@color/ui_line"
165
                android:visibility="visible" />
164 166
165 167
            <RelativeLayout
166
                android:id="@+id/rl_select_car"
168
                android:id="@+id/go_certificate"
167 169
                android:layout_width="fill_parent"
168
                android:background="@color/white"
169 170
                android:layout_height="45dp"
170
                android:visibility="gone">
171
                android:background="@color/white"
172
                android:visibility="visible">
173
171 174
                <TextView
175
                    android:id="@+id/go_title"
172 176
                    android:layout_width="wrap_content"
173 177
                    android:layout_height="match_parent"
174
                    android:text="品牌型号"
178
                    android:gravity="center"
179
                    android:paddingLeft="15dp"
180
                    android:text="去认证车主(获得充电优惠)"
175 181
                    android:textColor="@color/title_row"
176
                    android:textSize="15sp"
177
                    android:paddingLeft="16dp"
178
                    android:gravity="center"/>
182
                    android:textSize="15sp" />
179 183
180 184
                <TextView
181
                    android:id="@+id/et_che"
185
                    android:id="@+id/go_desc"
182 186
                    android:layout_width="wrap_content"
183 187
                    android:layout_height="45dp"
188
                    android:layout_alignParentTop="true"
189
                    android:layout_alignParentEnd="true"
190
                    android:layout_alignParentRight="true"
191
                    android:layout_marginEnd="15dp"
192
                    android:layout_marginRight="15dp"
184 193
                    android:background="@color/white"
185
                    android:hint="请选择品牌车型"
186 194
                    android:gravity="center|right"
187 195
                    android:singleLine="true"
188
                    android:textColorHint="@color/ui_68"
189 196
                    android:textColor="@color/ui_62"
197
                    android:textColorHint="@color/ui_68"
190 198
                    android:textSize="15sp"
199
                    tools:text="审核中" />
200
201
                <ImageView
202
                    android:id="@+id/go_cursor"
203
                    android:layout_width="wrap_content"
204
                    android:layout_height="match_parent"
205
                    android:layout_alignParentEnd="true"
206
                    android:layout_alignParentRight="true"
207
                    android:layout_centerVertical="true"
208
                    android:layout_marginRight="15dp"
209
                    android:src="@drawable/icon_more2_0" />
210
211
            </RelativeLayout>
212
213
            <RelativeLayout
214
                android:id="@+id/rl_select_car"
215
                android:layout_width="fill_parent"
216
                android:layout_height="45dp"
217
                android:background="@color/white"
218
                android:visibility="gone">
219
220
                <TextView
221
                    android:layout_width="wrap_content"
222
                    android:layout_height="match_parent"
223
                    android:gravity="center"
224
                    android:paddingLeft="16dp"
225
                    android:text="品牌型号"
226
                    android:textColor="@color/title_row"
227
                    android:textSize="15sp" />
228
229
                <TextView
230
                    android:id="@+id/et_che"
231
                    android:layout_width="wrap_content"
232
                    android:layout_height="45dp"
191 233
                    android:layout_alignParentTop="true"
192 234
                    android:layout_marginRight="8dp"
235
                    android:layout_toStartOf="@+id/imageView13"
193 236
                    android:layout_toLeftOf="@+id/imageView13"
194
                    android:layout_toStartOf="@+id/imageView13" />
237
                    android:background="@color/white"
238
                    android:gravity="center|right"
239
                    android:hint="请选择品牌车型"
240
                    android:singleLine="true"
241
                    android:textColor="@color/ui_62"
242
                    android:textColorHint="@color/ui_68"
243
                    android:textSize="15sp" />
195 244
196 245
                <ImageView
246
                    android:id="@+id/imageView13"
197 247
                    android:layout_width="wrap_content"
198 248
                    android:layout_height="match_parent"
199
                    android:src="@drawable/icon_more2_0"
200
                    android:layout_centerVertical="true"
201
                    android:layout_alignParentRight="true"
202 249
                    android:layout_alignParentEnd="true"
250
                    android:layout_alignParentRight="true"
251
                    android:layout_centerVertical="true"
203 252
                    android:layout_marginRight="16dp"
204
                    android:id="@+id/imageView13" />
253
                    android:src="@drawable/icon_more2_0" />
205 254
206 255
            </RelativeLayout>
207 256
@ -215,29 +264,29 @@
215 264
                    android:id="@+id/sex_button"
216 265
                    android:layout_width="wrap_content"
217 266
                    android:layout_height="wrap_content"
267
                    android:layout_alignParentEnd="true"
268
                    android:layout_alignParentRight="true"
269
                    android:layout_centerVertical="true"
218 270
                    android:layout_gravity="center_horizontal"
271
                    android:layout_marginRight="5dp"
219 272
                    android:background="@android:color/transparent"
220 273
                    android:button="@drawable/sex_btn"
221 274
                    android:gravity="center"
222 275
                    android:textOff=""
223
                    android:textOn=""
224
                    android:layout_marginRight="5dp"
225
                    android:layout_centerVertical="true"
226
                    android:layout_alignParentRight="true"
227
                    android:layout_alignParentEnd="true" />
276
                    android:textOn="" />
228 277
229 278
                <TextView
279
                    android:id="@+id/textView35"
230 280
                    android:layout_width="wrap_content"
231 281
                    android:layout_height="match_parent"
232
                    android:text="性别"
233
                    android:textColor="@color/title_row"
234
                    android:textSize="15sp"
235
                    android:paddingLeft="44px"
236
                    android:gravity="center"
237 282
                    android:layout_alignBottom="@+id/sex_button"
238
                    android:layout_alignParentLeft="true"
239 283
                    android:layout_alignParentStart="true"
240
                    android:id="@+id/textView35" />
284
                    android:layout_alignParentLeft="true"
285
                    android:gravity="center"
286
                    android:paddingLeft="44px"
287
                    android:text="性别"
288
                    android:textColor="@color/title_row"
289
                    android:textSize="15sp" />
241 290
242 291
            </com.zhy.autolayout.AutoRelativeLayout>
243 292
@ -250,30 +299,31 @@
250 299
                android:layout_width="fill_parent"
251 300
                android:layout_height="139px"
252 301
                android:visibility="gone">
302
253 303
                <TextView
254 304
                    android:layout_width="wrap_content"
255 305
                    android:layout_height="match_parent"
306
                    android:gravity="center"
307
                    android:paddingLeft="44px"
256 308
                    android:text="真实姓名"
257 309
                    android:textColor="@color/title_row"
258
                    android:textSize="15sp"
259
                    android:paddingLeft="44px"
260
                    android:gravity="center"/>
310
                    android:textSize="15sp" />
261 311
262 312
                <EditText
263 313
                    android:id="@+id/et_realName"
264 314
                    android:layout_width="wrap_content"
265 315
                    android:layout_height="match_parent"
316
                    android:layout_alignParentTop="true"
317
                    android:layout_alignParentEnd="true"
318
                    android:layout_alignParentRight="true"
319
                    android:layout_marginRight="44px"
266 320
                    android:background="@color/white"
321
                    android:gravity="center|right"
267 322
                    android:hint="请输入真实姓名"
268 323
                    android:singleLine="true"
269
                    android:textColorHint="@color/hintColor"
270 324
                    android:textColor="@color/hintColor"
271
                    android:gravity="center|right"
272
                    android:textSize="15sp"
273
                    android:layout_alignParentTop="true"
274
                    android:layout_alignParentRight="true"
275
                    android:layout_alignParentEnd="true"
276
                    android:layout_marginRight="44px" />
325
                    android:textColorHint="@color/hintColor"
326
                    android:textSize="15sp" />
277 327
278 328
            </com.zhy.autolayout.AutoRelativeLayout>
279 329
@ -282,8 +332,7 @@
282 332
                android:layout_width="match_parent"
283 333
                android:layout_height="0.5dp"
284 334
                android:background="@color/ui_line"
285
                android:visibility="gone"/>
286
335
                android:visibility="gone" />
287 336
288 337
289 338
        </LinearLayout>
@ -291,9 +340,9 @@
291 340
        <View
292 341
            android:layout_width="match_parent"
293 342
            android:layout_height="0.5dp"
294
            android:background="@color/ui_line"
295 343
            android:layout_marginTop="15dp"
296
            android:visibility="gone"/>
344
            android:background="@color/ui_line"
345
            android:visibility="gone" />
297 346
298 347
        <com.zhy.autolayout.AutoRelativeLayout
299 348
            android:layout_width="fill_parent"
@ -305,14 +354,14 @@
305 354
                android:id="@+id/car_button"
306 355
                android:layout_width="wrap_content"
307 356
                android:layout_height="wrap_content"
357
                android:layout_centerVertical="true"
308 358
                android:layout_gravity="center_horizontal"
359
                android:layout_marginLeft="44px"
309 360
                android:background="@android:color/transparent"
310 361
                android:button="@drawable/car_btn"
311
                android:layout_marginLeft="44px"
312 362
                android:gravity="center"
313 363
                android:textOff=""
314
                android:textOn=""
315
                android:layout_centerVertical="true" />
364
                android:textOn="" />
316 365
317 366
318 367
        </com.zhy.autolayout.AutoRelativeLayout>
@ -321,7 +370,7 @@
321 370
            android:layout_width="match_parent"
322 371
            android:layout_height="0.5dp"
323 372
            android:background="@color/ui_line"
324
            android:visibility="gone"/>
373
            android:visibility="gone" />
325 374
326 375
        <com.zhy.autolayout.AutoLinearLayout
327 376
            android:layout_width="fill_parent"
@ -329,27 +378,29 @@
329 378
            android:background="@color/white"
330 379
            android:orientation="horizontal"
331 380
            android:visibility="gone">
381
332 382
            <com.zhy.autolayout.AutoLinearLayout
333 383
                android:id="@+id/rl_1"
334 384
                android:layout_width="0dp"
335
                android:layout_weight="1"
336 385
                android:layout_height="match_parent"
386
                android:layout_weight="1"
337 387
                android:orientation="horizontal">
388
338 389
                <TextView
339 390
                    android:layout_width="wrap_content"
340 391
                    android:layout_height="match_parent"
341
                    android:text="品牌"
392
                    android:gravity="center_vertical"
342 393
                    android:paddingLeft="44px"
343
                    android:textSize="15sp"
394
                    android:text="品牌"
344 395
                    android:textColor="@color/hintColor"
345
                    android:gravity="center_vertical"/>
396
                    android:textSize="15sp" />
397
346 398
                <Spinner
347
                    android:id = "@+id/spinner_province_search_event"
348
                    android:layout_width = "match_parent"
349
                    android:layout_height ="match_parent"
399
                    android:id="@+id/spinner_province_search_event"
400
                    android:layout_width="match_parent"
401
                    android:layout_height="match_parent"
350 402
                    android:gravity="center"
351
                    android:spinnerMode="dialog">
352
                </Spinner >
403
                    android:spinnerMode="dialog"></Spinner>
353 404
354 405
355 406
                <!--<ImageView-->
@ -363,30 +414,28 @@
363 414
            </com.zhy.autolayout.AutoLinearLayout>
364 415
365 416
366
367 417
            <com.zhy.autolayout.AutoLinearLayout
368 418
                android:id="@+id/rl_2"
369 419
                android:layout_width="0dp"
370
                android:layout_weight="1"
371 420
                android:layout_height="match_parent"
421
                android:layout_weight="1"
372 422
                android:orientation="horizontal">
373 423
374 424
                <TextView
375 425
                    android:layout_width="wrap_content"
376 426
                    android:layout_height="match_parent"
377
                    android:text="车型"
427
                    android:gravity="center_vertical"
378 428
                    android:paddingLeft="44px"
379
                    android:textSize="15sp"
429
                    android:text="车型"
380 430
                    android:textColor="@color/hintColor"
381
                    android:gravity="center_vertical"/>
431
                    android:textSize="15sp" />
382 432
383 433
                <Spinner
384
                    android:id = "@+id/spinner_city_search_event"
385
                    android:layout_width = "match_parent"
386
                    android:layout_height ="match_parent"
434
                    android:id="@+id/spinner_city_search_event"
435
                    android:layout_width="match_parent"
436
                    android:layout_height="match_parent"
387 437
                    android:gravity="center"
388
                    android:spinnerMode="dialog">
389
                </Spinner >
438
                    android:spinnerMode="dialog"></Spinner>
390 439
                <!--<ImageView-->
391 440
                <!--android:layout_width="wrap_content"-->
392 441
                <!--android:layout_height="wrap_content"-->
@ -401,7 +450,6 @@
401 450
        </com.zhy.autolayout.AutoLinearLayout>
402 451
403 452
404
405 453
        <!--<LinearLayout-->
406 454
        <!--android:layout_width="match_parent"-->
407 455
        <!--android:layout_height="45dp"-->
@ -448,56 +496,57 @@
448 496
        <!--style="@style/Base.Widget.AppCompat.Spinner"/>-->
449 497
450 498
451
452 499
        <RelativeLayout
453 500
            android:layout_width="match_parent"
454 501
            android:layout_height="match_parent">
502
455 503
            <TextView
456 504
                android:id="@+id/tv_make_sure"
457 505
                android:layout_width="match_parent"
458 506
                android:layout_height="39dp"
459 507
                android:layout_alignParentBottom="true"
460
                android:layout_marginTop="15dp"
461 508
                android:layout_marginLeft="15dp"
509
                android:layout_marginTop="15dp"
462 510
                android:layout_marginRight="15dp"
463 511
                android:layout_marginBottom="8dp"
464 512
                android:background="@drawable/textview_greenstyle"
465
                android:textColor="@color/white"
466
                android:textSize="16sp"
513
                android:gravity="center"
467 514
                android:text="保存"
468
                android:gravity="center" />
515
                android:textColor="@color/white"
516
                android:textSize="16sp" />
517
469 518
            <ImageView
470 519
                android:id="@+id/tv_one"
471 520
                android:layout_width="wrap_content"
472 521
                android:layout_height="wrap_content"
473
                android:layout_gravity="center"
522
                android:layout_above="@+id/tv_make_sure"
474 523
475
                android:gravity="center"
524
                android:layout_centerHorizontal="true"
476 525
526
                android:layout_gravity="center"
527
                android:layout_marginBottom="20dp"
528
                android:background="@drawable/icon_5point"
529
                android:gravity="center"
477 530
                android:padding="5dp"
478 531
                android:scaleType="fitXY"
479
                android:background="@drawable/icon_5point"
480 532
                android:textColor="#000000"
481
                android:visibility="gone"
482
                android:layout_marginBottom="20dp"
483
                android:layout_above="@+id/tv_make_sure"
484
                android:layout_centerHorizontal="true" />
533
                android:visibility="gone" />
485 534
486 535
            <RelativeLayout
487 536
                android:id="@+id/rl_point"
488 537
                android:layout_width="80dp"
489 538
                android:layout_height="80dp"
490
                android:layout_marginBottom="50dp"
491
                android:layout_centerHorizontal="true"
492 539
                android:layout_alignParentBottom="true"
493
                android:visibility="gone"
494
                android:background="@drawable/icon_point_bg">
540
                android:layout_centerHorizontal="true"
541
                android:layout_marginBottom="50dp"
542
                android:background="@drawable/icon_point_bg"
543
                android:visibility="gone">
495 544
496 545
                <LinearLayout
497 546
                    android:layout_width="wrap_content"
498 547
                    android:layout_height="wrap_content"
499
                    android:orientation="vertical"
500
                    android:layout_centerInParent="true">
548
                    android:layout_centerInParent="true"
549
                    android:orientation="vertical">
501 550
502 551
                    <LinearLayout
503 552
                        android:layout_width="wrap_content"
@ -508,17 +557,17 @@
508 557
                            android:layout_width="wrap_content"
509 558
                            android:layout_height="wrap_content"
510 559
                            android:text="+"
511
                            android:textSize="16sp"
512
                            android:textColor="@color/white"/>
560
                            android:textColor="@color/white"
561
                            android:textSize="16sp" />
513 562
514 563
                        <TextView
515 564
                            android:id="@+id/tv_point"
516 565
                            android:layout_width="wrap_content"
517 566
                            android:layout_height="wrap_content"
518
                            android:text="20"
519
                            android:textSize="19sp"
520 567
                            android:layout_marginLeft="2dp"
521
                            android:textColor="@color/white"/>
568
                            android:text="20"
569
                            android:textColor="@color/white"
570
                            android:textSize="19sp" />
522 571
523 572
524 573
                    </LinearLayout>
@ -527,16 +576,15 @@
527 576
                        android:layout_width="wrap_content"
528 577
                        android:layout_height="wrap_content"
529 578
                        android:layout_gravity="center_horizontal"
579
                        android:layout_marginTop="2dp"
530 580
                        android:text="充电币"
531
                        android:textSize="13sp"
532 581
                        android:textColor="@color/white"
533
                        android:layout_marginTop="2dp"/>
582
                        android:textSize="13sp" />
534 583
535 584
536 585
                </LinearLayout>
537 586
538 587
539
540 588
            </RelativeLayout>
541 589
        </RelativeLayout>
542 590