1199 
//                            ProfileManager.getInstance().setUsericon(UserInfoActivity.this, "V");
1200 
//                            ImageTools.saveImageToGallery(getApplicationContext(),photo,"user_icon");
1201 936
1202 937 
                            String plusScore = jsonObject.getString("plusScore");
1203 938 
                            if (!plusScore.equals("")) {
@ -1209,12 +944,6 @@ public class UserInfoActivity extends Activity implements View.OnClickListener,
1209 944 
                                        rl_point.setVisibility(View.GONE);
1210 945 
                                    }
1211 946 
                                }, 1000);
1212 
//                                if (photo != null) {
1213 
//                                    photo.recycle();
1214 
//                                    photo = null;
1215 
////                                            bitmap.recycle();
1216 
//
1217 
//                                }
1218 947 
                                new Handler().postDelayed(new Runnable() {
1219 948 
                                    public void run() {
1220 949 
@ -1223,11 +952,6 @@ public class UserInfoActivity extends Activity implements View.OnClickListener,
1223 952 
                                }, 1500);
1224 953 
                            } else {
1225 954 
                                ToastUtil.showToast(UserInfoActivity.this, "保存成功", Toast.LENGTH_SHORT);
1226 
//                                if (photo != null) {
1227 
//                                    photo.recycle();
1228 
//                                    photo = null;
1229 
//
1230 
//                                }
1231 955 
                                UserInfoActivity.this.finish();
1232 956 
                            }
1233 957 
@ -1241,10 +965,7 @@ public class UserInfoActivity extends Activity implements View.OnClickListener,
1241 965 
                    } catch (JSONException e) {
1242 966 
                        e.printStackTrace();
1243 967 
                    }
1244
1245 
//                    Toast.makeText(UserInfoActivity.this, msg.obj.toString(), Toast.LENGTH_SHORT).show();
1246 968 
                    break;
1247
1248 969 
                case 5:
1249 970 
                    Toast.makeText(UserInfoActivity.this, msg.obj.toString(), Toast.LENGTH_SHORT).show();
1250 971 
                    break;
@ -1314,6 +1035,7 @@ public class UserInfoActivity extends Activity implements View.OnClickListener,
1314 1035 
    protected void onResume() {
1315 1036 
        super.onResume();
1316 1037 
        MobclickAgent.onResume(this);
1038 
        getCarOwnerCertificateList(false);
1317 1039 
    }
1318 1040
1319 1041 
    @Override
@ -1326,4 +1048,75 @@ public class UserInfoActivity extends Activity implements View.OnClickListener,
1326 1048 
    protected void onDestroy() {
1327 1049 
        super.onDestroy();
1328 1050 
    }
1051
1052 
    private void getCarOwnerCertificateList(Boolean showLoading) {
1053 
        if (showLoading) {
1054 
            loadDialog.show();
1055 
        }
1056 
        String url = MainApplication.url + "/zhannew/basic/web/index.php/car/my?userid=" + MainApplication.userId;
1057 
        OkHttpUtils.get().url(url).build().connTimeOut(6000).readTimeOut(6000).execute(new StringCallback() {
1058 
            @Override
1059 
            public void onError(Call call, Exception e) {
1060 
                e.printStackTrace();
1061 
                loadDialog.dismiss();
1062 
                Toast.makeText(getApplicationContext(), e.getLocalizedMessage(), Toast.LENGTH_SHORT).show();
1063 
                go_title.setText("去认证车主（获得充电优惠）");
1064 
                go_desc.setText("");
1065 
                go_cursor.setVisibility(View.VISIBLE);
1066 
            }
1067
1068 
            @Override
1069 
            public void onResponse(String response) {
1070 
                loadDialog.dismiss();
1071 
                String rtnCode = JsonUtils.getKeyResult(response, "rtnCode");
1072 
                if ("01".equals(rtnCode)) {
1073 
                    String data = JsonUtils.getKeyResult(response, "data");
1074 
                    List<CarOwnerCertificateBean> list = JsonUtils.parseToObjectList(data, CarOwnerCertificateBean.class);
1075 
                    CarSeriesEntity carSeriesEntity = null;
1076 
                    // 1 去认证  2审核中  3认证车主
1077 
                    if (list.size() == 0) {
1078 
                        certificateStatus = 1;
1079 
                    } else {
1080 
                        certificateStatus = 2;
1081 
                        for (CarOwnerCertificateBean bean : list) {
1082 
                            if (bean.getStatus() == 1 && bean.getMain() == 1) {
1083 
                                certificateStatus = 3;
1084 
                                Gson gson = new Gson();
1085 
                                carSeriesEntity = gson.fromJson(bean.getChexing(), CarSeriesEntity.class);
1086 
                                break;
1087 
                            }
1088 
                        }
1089 
                    }
1090
1091 
                    if (certificateStatus == 2) {
1092 
                        go_title.setText("认证车主");
1093 
                        go_desc.setText("审核中");
1094 
                        go_cursor.setVisibility(View.GONE);
1095 
                    } else if (certificateStatus == 3) {
1096 
                        go_title.setText("认证车主");
1097 
                        if (carSeriesEntity != null) {
1098 
                            go_desc.setText(carSeriesEntity.getSeriesName());
1099 
                        }
1100 
                        go_cursor.setVisibility(View.GONE);
1101 
                    } else {
1102 
                        go_title.setText("去认证车主（获得充电优惠）");
1103 
                        go_desc.setText("");
1104 
                        go_cursor.setVisibility(View.VISIBLE);
1105 
                    }
1106
1107 
                    if (certificateStatus == 1) {
1108 
                        startActivity(new Intent(getApplication(), CarOwnerCertificateActivity.class));
1109 
                    }
1110
1111 
                } else {
1112 
                    String rtnMsg = JsonUtils.getKeyResult(response, "rtnMsg");
1113 
                    Toast.makeText(getApplicationContext(), rtnMsg, Toast.LENGTH_SHORT).show();
1114
1115 
                    go_title.setText("去认证车主（获得充电优惠）");
1116 
                    go_desc.setText("");
1117 
                    go_cursor.setVisibility(View.VISIBLE);
1118 
                }
1119 
            }
1120 
        });
1121 
    }
1329 1122 
}

+ 1 - 2
app/src/main/java/com/electric/chargingpile/adapter/CarOwnerCertificateListAdapter.java
ファイルの表示 

@ -49,8 +49,7 @@ public class CarOwnerCertificateListAdapter extends RecyclerView.Adapter<CarOwne
49 49 
        CarOwnerCertificateBean bean = mList.get(position);
50 50 
        Gson gson = new Gson();
51 51 
        CarSeriesEntity carSeriesEntity = gson.fromJson(bean.getChexing(), CarSeriesEntity.class);
52 
//        Glide.with(mContext).load(carSeriesEntity.getIcon()).into(holder.master_pic);
53 
//        Picasso.with(mContext).load(carSeriesEntity.getMasterPic()).into(holder.master_pic);
52 
        Glide.with(mContext).load(carSeriesEntity.getIcon()).into(holder.master_pic);
54 53 
        holder.name.setText(carSeriesEntity.getCompanyName());
55 54 
        holder.detail_name.setText(carSeriesEntity.getSeriesName());
56 55

+ 6 - 2
app/src/main/java/com/electric/chargingpile/application/MainApplication.java
ファイルの表示 

@ -75,10 +75,14 @@ public class MainApplication extends MultiDexApplication {
75 75 
    public static Boolean firstSsyd;
76 76 
    public static String password = "";
77 77 
    public static String url = "http://59.110.68.162";// 充电桩测试环境
78 
//        public static String url = "http://cdz.evcharge.cc";// 充电桩正式环境
78 
    public static String pic_url = "http://59.110.68.162/zhannew/uploadfile/";
79 
//    public static String url = "http://cdz.evcharge.cc";// 充电桩正式环境
80 
//    public static String pic_url = "http://cdz.evcharge.cc/zhannew/uploadfile/";
81
79 82 
//    public static String urlNew = "http://123.56.67.7:83/api/0300";// 一电测试环境
80 83 
    public static String urlNew = "https://api.touchev.com:83/api/0300";// 一电正式环境
81 
    public static String pic_url = "http://cdz.evcharge.cc/zhannew/uploadfile/";
84
85
82 86 
    //	public static String url = "https://cdz.d1ev.com";
83 87 
    public static String build_flag = "0";
84 88 
    public static String support = "0"; // true:本APP支付  false:其他方式支付

+ 0 - 11
app/src/main/java/com/electric/chargingpile/entity/CarSeriesEntity.java
ファイルの表示 

@ -13,17 +13,6 @@ public class CarSeriesEntity {
13 13 
    private String maxSalePrice;
14 14 
    private String minSalePrice;
15 15
16 
//    public CarSeriesEntity(String brandId, String brandName, String companyId, String companyName, String seriesId, String seriesName, String salePrice, String icon) {
17 
//        this.brandId = brandId;
18 
//        this.brandName = brandName;
19 
//        this.companyId = companyId;
20 
//        this.companyName = companyName;
21 
//        this.seriesId = seriesId;
22 
//        this.seriesName = seriesName;
23 
//        this.salePrice = salePrice;
24 
//        this.icon = icon;
25 
//    }
26
27 16 
    public String getBrandId() {
28 17 
        return brandId;
29 18 
    }

+ 211 - 253
app/src/main/res/layout/activity_user_info.xml
ファイルの表示 

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

桩详情页面开发完成 · b20d745808 - 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 346 Releases 18 Wiki
Explorar el Código

桩详情页面开发完成

huyuguo %!s(int64=6) %!d(string=hace) años
padre
d5730d80c6
commit
b20d745808
Se han modificado 8 ficheros con 81 adiciones y 91 borrados
Dividir vista Mostrar estadísticas de diff
  1. 2 2
      app/src/main/AndroidManifest.xml
  2. 31 32
      app/src/main/java/com/electric/chargingpile/fragment/DetailsFragment.java
  3. BIN
      app/src/main/res/drawable-hdpi/right_cursor.png
  4. BIN
      app/src/main/res/drawable-mdpi/right_cursor.png
  5. BIN
      app/src/main/res/drawable-xhdpi/right_cursor.png
  6. BIN
      app/src/main/res/drawable-xxhdpi/right_cursor.png
  7. BIN
      app/src/main/res/drawable-xxxhdpi/right_cursor.png
  8. 48 57
      app/src/main/res/layout/fragmen_details_new.xml

+ 2 - 2
app/src/main/AndroidManifest.xml
Ver fichero 

@ -2,8 +2,8 @@
2 2 
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3 3 
    xmlns:tools="http://schemas.android.com/tools"
4 4 
    package="com.electric.chargingpile"
5 
    android:versionCode="91"
6 
    android:versionName="3.5.3">
5 
    android:versionCode="88"
6 
    android:versionName="3.5.0">
7 7 
    <uses-permission android:name="android.permission.BLUETOOTH" />
8 8 
    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
9 9

+ 31 - 32
app/src/main/java/com/electric/chargingpile/fragment/DetailsFragment.java
Ver fichero 

@ -11,7 +11,9 @@ import android.os.Build;
11 11 
import android.os.Bundle;
12 12 
import android.os.Handler;
13 13 
import android.os.Message;
14
14 15 
import androidx.fragment.app.Fragment;
16
15 17 
import android.text.SpannableString;
16 18 
import android.text.Spanned;
17 19 
import android.text.style.ForegroundColorSpan;
 
@ -39,6 +41,7 @@ import com.electric.chargingpile.activity.PriceDetailsActivity;
39 41 
import com.electric.chargingpile.application.MainApplication;
40 42 
import com.electric.chargingpile.data.ChartData;
41 43 
import com.electric.chargingpile.data.MyOtto;
44 
import com.electric.chargingpile.data.PileData;
42 45 
import com.electric.chargingpile.data.RankinglistRefreshEvent;
43 46 
import com.electric.chargingpile.data.Zhan;
44 47 
import com.electric.chargingpile.util.CommonParams;
 
@ -93,6 +96,7 @@ import java.net.URLEncoder;
93 96 
import java.security.MessageDigest;
94 97 
import java.text.SimpleDateFormat;
95 98 
import java.util.ArrayList;
99 
import java.util.Calendar;
96 100 
import java.util.Date;
97 101 
import java.util.HashMap;
98 102 
import java.util.List;
 
@ -126,7 +130,8 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
126 130 
    private TextView tv_claimer, tv_grade;
127 131 
    private View view_789;
128 132 
    String zhan_name, zhan_id, tid, zhan_address, supplier, total_num, fast_num, slow_num, stop_cost, charge_cost, telephone, remarks, suit_car, claimer, belong_attribute, poi_jing, poi_wei, charge_cost_way, other_cost, work_open, work_close;
129 
    private TextView tv_cost_info, tv_current_charging, tv_detail_charging_enter;
133 
    private TextView current_time_slot, tv_detail_charging_enter;
134 
    private LinearLayout tv_cost_info;
130 135 
    private LinearLayout ll_no_fenshi, ll_yes_fenshi;
131 136 
    private TextView tv_today_num;
132 137 
@ -258,7 +263,7 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
258 263 
                        other_cost = JsonUtils.getKeyResult(info_decode, "other_cost");
259 264 
                        work_open = JsonUtils.getKeyResult(info_decode, "work_open");
260 265 
                        work_close = JsonUtils.getKeyResult(info_decode, "work_close");
261
266 
                        zongjia = JsonUtils.getKeyResult(info_decode, "zongjia");
262 267 
                        String park_location = JsonUtils.getKeyResult(info_decode, "park_location");
263 268 
                        String own_pay = JsonUtils.getKeyResult(info_decode, "own_pay");
264 269 
                        if (detailsFragmentListener != null) {
 
@ -293,23 +298,20 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
293 298 
                            } else {
294 299 
                                ll_no_fenshi.setVisibility(View.GONE);
295 300 
                                ll_yes_fenshi.setVisibility(View.VISIBLE);
296 
                                SimpleDateFormat formatter = new SimpleDateFormat("HH:mm");
297 
                                Date curDate = new Date(System.currentTimeMillis());
298 
                                String token = formatter.format(curDate);
299
300 
                                String t = String.valueOf(DateUtils.getShortStringToDate(token));
301 
                                for (int i = 0; i < datas.size(); i++) {
302 
                                    if (Integer.parseInt(String.valueOf(DateUtils.getShortStringToDate(datas.get(i).getString("start")))) < Integer.parseInt(t)
303 
                                            && Integer.parseInt(String.valueOf(DateUtils.getShortStringToDate(datas.get(i).getString("end")))) > Integer.parseInt(t)) {
304 
                                        double c = Double.parseDouble(datas.get(i).getString("charge_free"));
305 
                                        BigDecimal bd = new BigDecimal(c);
306 
                                        double d = bd.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
307 
                                        double d_service = Double.parseDouble(datas.get(i).getString("service_free"));
308 
                                        tv_current_charging.setText(d + "元/度");
309 
                                        detail_serve_cost_two.setText(d_service + "元/度");
301
302 
                                Calendar calendar = Calendar.getInstance();
303 
                                int hours = calendar.get(Calendar.HOUR_OF_DAY);
304 
                                int minutes = calendar.get(Calendar.MINUTE);
305 
                                int totalMinutes = hours * 60 + minutes;
306
307 
                                for (JSONObject obj : DetailsFragment.datas) {
308 
                                    PileData.FenshiInfoBean bean = JsonUtils.parseToObjectBean(obj.toString(), PileData.FenshiInfoBean.class);
309 
                                    if (totalMinutes >= bean.getStartTotalMinutes() && totalMinutes <= bean.getEndTotalMinutes()) {
310 
                                        current_time_slot.setText("当前时间段 " + bean.getStart() + "-" + bean.getEnd());
310 311 
                                        break;
311 312 
                                    }
312 313 
                                }
314 
                                total_price.setText(zongjia);
313 315 
                            }
314 316 
                        } else {
315 317 
                            ll_no_fenshi.setVisibility(View.VISIBLE);
 
@ -332,15 +334,12 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
332 334 
                            acableNum = JsonUtils.getKeyResult(info_decode, "acableNum");
333 335 
                            dcableNum = JsonUtils.getKeyResult(info_decode, "dcableNum");
334 336 
                            freeStatus = "1"; // 有状态的站点
335 
//                            Log.e("dcableNum",dcableNum);
336 337 
                        } else {
337 338 
                            freeStatus = "0"; // 无状态的站点
338 339 
                        }
339 340
340
341 341 
                        detail_zhan_name.setText(zhan_name);
342 342
343
344 343 
                        if (supplier.equals("")) {
345 344 
                            detail_supplier.setText("暂无");
346 345 
                        } else {
 
@ -791,6 +790,7 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
791 790 
        }
792 791 
    };
793 792 
    private ImageView parking_icon;
793 
    private String zongjia;
794 794
795 795 
    @Override
796 796 
    public View onCreateView(LayoutInflater inflater, ViewGroup container,
 
@ -855,7 +855,7 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
855 855
856 856 
    private TextView detail_address, detail_grade, detail_picnum, detail_zhan_distance,
857 857 
            window_tv_fast_total_num, window_tv_fast_free_label, window_tv_fast_free_num, window_tv_slow_total_num, window_tv_slow_free_label, window_tv_slow_free_num,
858 
            detail_supplier, detail_cost, detail_serve_cost, detail_serve_cost_two,
858 
            detail_supplier, detail_cost, detail_serve_cost, total_price,
859 859 
            details_claimer;
860 860 
    private AlignTextView detail_charge_cost;
861 861 
    private AlignTextView detail_park_cost;
 
@ -878,11 +878,10 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
878 878 
        ll_no_fenshi = (LinearLayout) v.findViewById(R.id.ll_no_fenshi);
879 879 
        ll_yes_fenshi = (LinearLayout) v.findViewById(R.id.ll_yes_fenshi);
880 880
881 
        tv_cost_info = (TextView) v.findViewById(R.id.tv_cost_info);
882 
        if (tv_cost_info != null) {
883 
            tv_cost_info.setOnClickListener(this);
884 
        }
885 
        tv_current_charging = (TextView) v.findViewById(R.id.tv_current_charging);
881 
        tv_cost_info = v.findViewById(R.id.tv_cost_info);
882 
        tv_cost_info.setOnClickListener(this);
883
884 
        current_time_slot = (TextView) v.findViewById(R.id.current_time_slot);
886 885 
        iv_level_img = (ImageView) v.findViewById(R.id.iv_level_img);
887 886 
        detail_view = v.findViewById(R.id.detail_view);
888 887 
        detail_claimer_remark = (LinearLayout) v.findViewById(R.id.detail_claimer_remark);
 
@ -911,7 +910,7 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
911 910 
        detail_cost = (TextView) v.findViewById(R.id.detail_cost);
912 911 
        detail_charge_cost = (AlignTextView) v.findViewById(R.id.detail_charge_cost);
913 912 
        detail_serve_cost = (TextView) v.findViewById(R.id.detail_serve_cost);
914 
        detail_serve_cost_two = (TextView) v.findViewById(R.id.detail_serve_cost_two);
913 
        total_price = (TextView) v.findViewById(R.id.total_price);
915 914 
        detail_park_cost = (AlignTextView) v.findViewById(R.id.detail_park_cost);
916 915 
        detail_time = (AlignTextView) v.findViewById(R.id.detail_time);
917 916 
        detail_list_num = (TextView) v.findViewById(R.id.detail_list_num);
 
@ -985,7 +984,7 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
985 984 
                if ("1".equals(freeStatus)) { // 有状态的站点
986 985 
                    if ("0".equals(acableNum) && "0".equals(dcableNum)) { // 无空闲桩
987 986 
                        ReportParkingDialogFragment reportParkingDialogFragment = ReportParkingDialogFragment.newInstance(ReportParkingDialogFragment.TYPE_THIRD);
988 
                        reportParkingDialogFragment.show(getFragmentManager(),"没有充电车位");
987 
                        reportParkingDialogFragment.show(getFragmentManager(), "没有充电车位");
989 988 
                        MobclickAgent.onEvent(getContext(), "1127");
990 989 
                    } else {
991 990 
                        if (MainApplication.center == null) {
 
@ -994,7 +993,7 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
994 993 
                            double distance = AMapUtils.calculateLineDistance(MainApplication.center, latLng);
995 994 
                            if (distance > 100) {
996 995 
                                ReportParkingDialogFragment reportParkingDialogFragment = ReportParkingDialogFragment.newInstance(ReportParkingDialogFragment.TYPE_FIRST);
997 
                                reportParkingDialogFragment.show(getFragmentManager(),"超过100米，无法上报充电车位");
996 
                                reportParkingDialogFragment.show(getFragmentManager(), "超过100米，无法上报充电车位");
998 997 
                            } else {
999 998 
                                ReportParkingDialogFragment reportParkingDialogFragment = ReportParkingDialogFragment.newInstance(ReportParkingDialogFragment.TYPE_SECOND);
1000 999 
                                reportParkingDialogFragment.setOnReportParkingDialogFragmentListener(new ReportParkingDialogFragment.OnReportParkingDialogFragmentListener() {
 
@ -1003,7 +1002,7 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
1003 1002 
                                        addVacancy();
1004 1003 
                                    }
1005 1004 
                                });
1006 
                                reportParkingDialogFragment.show(getFragmentManager(),"上报车位");
1005 
                                reportParkingDialogFragment.show(getFragmentManager(), "上报车位");
1007 1006 
                            }
1008 1007 
                            MobclickAgent.onEvent(getContext(), "1126");
1009 1008 
                        }
 
@ -1015,7 +1014,7 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
1015 1014 
                        double distance = AMapUtils.calculateLineDistance(MainApplication.center, latLng);
1016 1015 
                        if (distance > 100) {
1017 1016 
                            ReportParkingDialogFragment reportParkingDialogFragment = ReportParkingDialogFragment.newInstance(ReportParkingDialogFragment.TYPE_FIRST);
1018 
                            reportParkingDialogFragment.show(getFragmentManager(),"超过100米，无法上报充电车位");
1017 
                            reportParkingDialogFragment.show(getFragmentManager(), "超过100米，无法上报充电车位");
1019 1018 
                        } else {
1020 1019 
                            ReportParkingDialogFragment reportParkingDialogFragment = ReportParkingDialogFragment.newInstance(ReportParkingDialogFragment.TYPE_SECOND);
1021 1020 
                            reportParkingDialogFragment.setOnReportParkingDialogFragmentListener(new ReportParkingDialogFragment.OnReportParkingDialogFragmentListener() {
 
@ -1024,7 +1023,7 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
1024 1023 
                                    addVacancy();
1025 1024 
                                }
1026 1025 
                            });
1027 
                            reportParkingDialogFragment.show(getFragmentManager(),"上报车位");
1026 
                            reportParkingDialogFragment.show(getFragmentManager(), "上报车位");
1028 1027 
                        }
1029 1028 
                        MobclickAgent.onEvent(getContext(), "1126");
1030 1029 
                    }
 
@ -1622,7 +1621,7 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
1622 1621 
     */
1623 1622
1624 1623 
    private void addVacancy() {
1625 
        if (!MainApplication.isLogin()){
1624 
        if (!MainApplication.isLogin()) {
1626 1625 
            startActivity(new Intent(getActivity().getApplicationContext(), LoginActivity.class));
1627 1626 
            ToastUtil.showToast(getActivity().getApplicationContext(), "请先登录", Toast.LENGTH_SHORT);
1628 1627 
            return;

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


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


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


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


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


+ 48 - 57
app/src/main/res/layout/fragmen_details_new.xml
Ver fichero 

@ -249,6 +249,7 @@
249 249 
                            android:layout_gravity="center_vertical"
250 250 
                            android:paddingRight="10dp"
251 251 
                            android:src="@drawable/slow_icon" />
252
252 253 
                        <TextView
253 254 
                            android:id="@+id/window_tv_slow_free_label"
254 255 
                            android:layout_width="wrap_content"
 
@ -434,85 +435,75 @@
434 435
435 436 
                </LinearLayout>
436 437
438 
                <!-- 分时电价显示 -->
437 439 
                <LinearLayout
438 440 
                    android:id="@+id/ll_yes_fenshi"
439 441 
                    android:layout_width="match_parent"
440 442 
                    android:layout_height="wrap_content"
441 
                    android:orientation="vertical"
442 
                    android:visibility="gone">
443
444 
                    <RelativeLayout
445 
                        android:layout_width="match_parent"
446 
                        android:layout_height="match_parent">
443 
                    android:orientation="horizontal"
444 
                    android:visibility="gone"
445 
                    tools:visibility="visible">
447 446
448 
                        <TextView
449 
                            android:layout_width="wrap_content"
450 
                            android:layout_height="wrap_content"
451 
                            android:layout_alignParentLeft="true"
452 
                            android:text="支付信息"
453 
                            android:textColor="@color/ui_65"
454 
                            android:textSize="14sp" />
447 
                    <LinearLayout
448 
                        android:layout_width="0dp"
449 
                        android:layout_height="wrap_content"
450 
                        android:layout_weight="3"
451 
                        tools:background="#00ff00"
452 
                        android:orientation="vertical">
455 453
456 
                        <TextView
457 
                            android:id="@+id/tv_cost_info"
454 
                        <LinearLayout
458 455 
                            android:layout_width="wrap_content"
459 456 
                            android:layout_height="wrap_content"
460 
                            android:layout_alignParentRight="true"
461 
                            android:gravity="right"
462 
                            android:text="电价详情"
463 
                            android:textColor="@color/lvse"
464 
                            android:textSize="14sp" />
465
466 
                    </RelativeLayout>
457 
                            android:orientation="horizontal">
467 458
468 
                    <RelativeLayout
469 
                        android:layout_width="match_parent"
470 
                        android:layout_height="match_parent"
471 
                        android:layout_marginTop="10dp">
459 
                            <TextView
460 
                                android:id="@+id/total_price"
461 
                                android:layout_width="wrap_content"
462 
                                android:layout_height="wrap_content"
463 
                                android:textColor="#FA6400"
464 
                                android:textSize="20sp"
465 
                                android:textStyle="bold"
466 
                                tools:text="1.1406" />
472 467
473 
                        <TextView
474 
                            android:layout_width="wrap_content"
475 
                            android:layout_height="wrap_content"
476 
                            android:layout_alignParentLeft="true"
477 
                            android:text="当前电价"
478 
                            android:textColor="@color/ui_65"
479 
                            android:textSize="14sp" />
468 
                            <TextView
469 
                                android:layout_width="wrap_content"
470 
                                android:layout_height="wrap_content"
471 
                                android:text="元/度"
472 
                                android:textColor="#FA6400"
473 
                                android:textSize="12sp" />
474 
                        </LinearLayout>
480 475
481 476 
                        <TextView
482 
                            android:id="@+id/tv_current_charging"
477 
                            android:id="@+id/current_time_slot"
483 478 
                            android:layout_width="wrap_content"
484 479 
                            android:layout_height="wrap_content"
485 
                            android:layout_alignParentRight="true"
486 
                            android:text="0.8元/度"
487 
                            android:textColor="@color/ui_65"
488 
                            android:textSize="14sp" />
480 
                            android:paddingTop="2dp"
481 
                            android:textColor="@color/color_888888"
482 
                            android:textSize="12sp"
483 
                            tools:text="当前时段 09:00-12:00" />
489 484
490 
                    </RelativeLayout>
485 
                    </LinearLayout>
491 486
492 
                    <RelativeLayout
493 
                        android:layout_width="match_parent"
487 
                    <LinearLayout
488 
                        android:id="@+id/tv_cost_info"
489 
                        android:layout_width="0dp"
494 490 
                        android:layout_height="match_parent"
495 
                        android:layout_marginTop="10dp">
491 
                        android:layout_weight="2"
492 
                        tools:background="#ff0000"
493 
                        android:gravity="center_vertical|right">
496 494
497 495 
                        <TextView
498 496 
                            android:layout_width="wrap_content"
499 497 
                            android:layout_height="wrap_content"
500 
                            android:layout_alignParentLeft="true"
501 
                            android:text="服务费用"
502 
                            android:textColor="@color/ui_65"
498 
                            android:paddingRight="2dp"
499 
                            android:text="电价详情"
500 
                            android:textColor="@color/color_222222"
503 501 
                            android:textSize="14sp" />
504
505 
                        <TextView
506 
                            android:id="@+id/detail_serve_cost_two"
502 
                        <ImageView
507 503 
                            android:layout_width="wrap_content"
508 504 
                            android:layout_height="wrap_content"
509 
                            android:layout_alignParentRight="true"
510 
                            android:text=""
511 
                            android:textColor="@color/ui_65"
512 
                            android:textSize="14sp" />
513
514 
                    </RelativeLayout>
515
505 
                            android:src="@drawable/right_cursor" />
506 
                    </LinearLayout>
516 507 
                </LinearLayout>
517 508
518 509 
                <RelativeLayout
 
@ -847,8 +838,8 @@
847 838 
        android:layout_marginBottom="15dp"
848 839 
        android:src="@drawable/detail_report_parking"
849 840 
        android:visibility="gone"
850 
        tools:visibility="visible"
851 841 
        app:layout_constraintBottom_toBottomOf="parent"
852 
        app:layout_constraintRight_toRightOf="parent" />
842 
        app:layout_constraintRight_toRightOf="parent"
843 
        tools:visibility="visible" />
853 844
854 845 
</androidx.constraintlayout.widget.ConstraintLayout>