Browse Source

气泡页快慢充数据显示样式修改

huyuguo 4 years ago
parent
commit
45611a4d09

+ 30 - 33
app/src/main/java/com/electric/chargingpile/activity/MainMapActivity.java

365
    public static zhan_list current_chargePoint;
365
    public static zhan_list current_chargePoint;
366
    public static Marker nMarker;
366
    public static Marker nMarker;
367
    private boolean paoShow = false;
367
    private boolean paoShow = false;
368
    private TextView windowName, windowGrade, windowCost, windowFastNum, windowFastAble, windowFastAbleNum,
369
            windowSlowNum, windowSlowAble, windowSlowAbleNum, windowCommentNum, windowDistance, stopCost;
368
    private TextView windowName, windowGrade, windowCost, window_tv_fast_free_num,window_tv_fast_free_label,window_tv_fast_total_num,
369
            window_tv_slow_free_label,window_tv_slow_free_num,window_tv_slow_total_num, windowCommentNum, windowDistance, stopCost;
370
    private RelativeLayout windowGo, windowZhanDetails, windowComments;
370
    private RelativeLayout windowGo, windowZhanDetails, windowComments;
371
    private ImageView windowAd, windowGradeImg;
371
    private ImageView windowAd, windowGradeImg;
372
    public static RelativeLayout windowLayout;
372
    public static RelativeLayout windowLayout;
1228
        stopCost = findViewById(R.id.window_tv_stop_cost);
1228
        stopCost = findViewById(R.id.window_tv_stop_cost);
1229
        windowGrade = (TextView) findViewById(R.id.window_tv_zhan_grade);
1229
        windowGrade = (TextView) findViewById(R.id.window_tv_zhan_grade);
1230
        windowCost = (TextView) findViewById(R.id.window_tv_zhan_cost);
1230
        windowCost = (TextView) findViewById(R.id.window_tv_zhan_cost);
1231
        windowFastNum = (TextView) findViewById(R.id.window_tv_fast_num);
1232
        windowFastAble = (TextView) findViewById(R.id.window_tv_fastable);
1233
        windowFastAbleNum = (TextView) findViewById(R.id.window_tv_fastable_num);
1234
        windowSlowNum = (TextView) findViewById(R.id.window_tv_slow_num);
1235
        windowSlowAble = (TextView) findViewById(R.id.window_tv_slowable);
1236
        windowSlowAbleNum = (TextView) findViewById(R.id.window_tv_slowable_num);
1231
        window_tv_fast_free_num = (TextView) findViewById(R.id.window_tv_fast_free_num);
1232
        window_tv_fast_free_label = findViewById(R.id.window_tv_fast_free_label);
1233
        window_tv_fast_total_num = findViewById(R.id.window_tv_fast_total_num);
1234
        window_tv_slow_free_label = findViewById(R.id.window_tv_slow_free_label);
1235
        window_tv_slow_free_num = findViewById(R.id.window_tv_slow_free_num);
1236
        window_tv_slow_total_num = findViewById(R.id.window_tv_slow_total_num);
1237
1237
        windowCommentNum = (TextView) findViewById(R.id.window_tv_comment_num);
1238
        windowCommentNum = (TextView) findViewById(R.id.window_tv_comment_num);
1238
//        windowDistance = (TextView) findViewById(R.id.window_tv_zhan_distance);
1239
//        windowDistance = (TextView) findViewById(R.id.window_tv_zhan_distance);
1239
        windowChargeRecordCnt = findViewById(R.id.window_tv_charge_record_cnt);
1240
        windowChargeRecordCnt = findViewById(R.id.window_tv_charge_record_cnt);
5230
5231
5231
        if ("1".equals(fenshi_is)) {
5232
        if ("1".equals(fenshi_is)) {
5232
            final String fenshi_info = JsonUtils.getKeyResult(info, "fenshi_info");
5233
            final String fenshi_info = JsonUtils.getKeyResult(info, "fenshi_info");
5233
            ArrayList<PileData.FenshiInfoBean> fenshiList = (ArrayList<PileData.FenshiInfoBean>)JsonUtils.parseToObjectList(fenshi_info, PileData.FenshiInfoBean.class);
5234
            ArrayList<PileData.FenshiInfoBean> fenshiList = (ArrayList<PileData.FenshiInfoBean>) JsonUtils.parseToObjectList(fenshi_info, PileData.FenshiInfoBean.class);
5234
            Calendar calendar = Calendar.getInstance();
5235
            Calendar calendar = Calendar.getInstance();
5235
            int hours = calendar.get(Calendar.HOUR_OF_DAY);
5236
            int hours = calendar.get(Calendar.HOUR_OF_DAY);
5236
            int minutes = calendar.get(Calendar.MINUTE);
5237
            int minutes = calendar.get(Calendar.MINUTE);
5237
            int totalMinutes =  hours* 60 + minutes;
5238
            int totalMinutes = hours * 60 + minutes;
5238
5239
5239
            TextView fenshi_info_textview = findViewById(R.id.fenshi_info_textview);
5240
            TextView fenshi_info_textview = findViewById(R.id.fenshi_info_textview);
5240
            for (PileData.FenshiInfoBean bean : fenshiList) {
5241
            for (PileData.FenshiInfoBean bean : fenshiList) {
5356
        }
5357
        }
5357
5358
5358
        if (null != acableNum && null != acNum
5359
        if (null != acableNum && null != acNum
5359
                && null != dcableNum && null != dcNum) {
5360
            windowFastNum.setText(dcNum);
5361
            windowFastAbleNum.setText(dcableNum);
5362
            windowFastAble.setVisibility(View.VISIBLE);
5363
            windowFastAbleNum.setVisibility(View.VISIBLE);
5364
            windowSlowNum.setText(acNum);
5365
            windowSlowAbleNum.setText(acableNum);
5366
            windowSlowAble.setVisibility(View.VISIBLE);
5367
            windowSlowAbleNum.setVisibility(View.VISIBLE);
5368
5369
//            paoSlow.setText("空闲" + acableNum + "/共" + acNum + "个");
5370
//            paoFast.setText("空闲" + dcableNum + "/共" + dcNum + "个");
5371
        } else {
5360
                && null != dcableNum && null != dcNum) { // 有桩状态
5361
            window_tv_fast_free_num.setText(dcableNum); // 快充空闲桩数量
5362
            window_tv_fast_total_num.setText("/" + dcNum); // 快充桩总数
5363
            window_tv_fast_free_label.setVisibility(View.VISIBLE);
5364
            window_tv_fast_total_num.setVisibility(View.VISIBLE);
5365
5366
            window_tv_slow_free_num.setText(acableNum); // 慢充空闲桩数量
5367
            window_tv_slow_total_num.setText("/" + acNum);
5368
            window_tv_slow_free_label.setVisibility(View.VISIBLE);
5369
            window_tv_slow_total_num.setVisibility(View.VISIBLE);
5370
        } else { // 没有桩状态
5372
            if (fast_num.equals("")) {
5371
            if (fast_num.equals("")) {
5373
                windowFastNum.setText("0");
5372
                window_tv_fast_free_num.setText("0");
5374
            } else {
5373
            } else {
5375
                windowFastNum.setText(fast_num);
5374
                window_tv_fast_free_num.setText(fast_num);
5376
            }
5375
            }
5377
5378
            windowFastAble.setVisibility(View.GONE);
5379
            windowFastAbleNum.setVisibility(View.GONE);
5376
            window_tv_fast_free_label.setVisibility(View.GONE);
5377
            window_tv_fast_total_num.setVisibility(View.GONE);
5380
            if (slow_num.equals("")) {
5378
            if (slow_num.equals("")) {
5381
                windowSlowNum.setText("0");
5379
                window_tv_slow_free_num.setText("0");
5382
            } else {
5380
            } else {
5383
                windowSlowNum.setText(slow_num);
5381
                window_tv_slow_free_num.setText(slow_num);
5384
            }
5382
            }
5385
5386
            windowSlowAble.setVisibility(View.GONE);
5387
            windowSlowAbleNum.setVisibility(View.GONE);
5383
            window_tv_slow_free_label.setVisibility(View.GONE);
5384
            window_tv_slow_total_num.setVisibility(View.GONE);
5388
        }
5385
        }
5389
5386
5390
5387

BIN
app/src/main/res/drawable-hdpi/fast_icon.png


BIN
app/src/main/res/drawable-hdpi/slow_icon.png


BIN
app/src/main/res/drawable-mdpi/fast_icon.png


BIN
app/src/main/res/drawable-mdpi/slow_icon.png


BIN
app/src/main/res/drawable-xhdpi/fast_icon.png


BIN
app/src/main/res/drawable-xhdpi/slow_icon.png


BIN
app/src/main/res/drawable-xxhdpi/fast_icon.png


BIN
app/src/main/res/drawable-xxhdpi/slow_icon.png


BIN
app/src/main/res/drawable-xxxhdpi/fast_icon.png


BIN
app/src/main/res/drawable-xxxhdpi/slow_icon.png


+ 71 - 67
app/src/main/res/layout/activity_main_map.xml

1158
                    android:text="免费停车"
1158
                    android:text="免费停车"
1159
                    android:textColor="#828282"
1159
                    android:textColor="#828282"
1160
                    android:textSize="11dp" />
1160
                    android:textSize="11dp" />
1161
1161
                <TextView
1162
                <TextView
1162
                    android:id="@+id/fenshi_info_textview"
1163
                    android:id="@+id/fenshi_info_textview"
1163
                    tools:text="18:00开始 1.4775元/度"
1164
                    android:layout_width="match_parent"
1165
                    android:layout_height="match_parent"
1166
                    android:gravity="center_vertical|right"
1164
                    android:textColor="#222222"
1167
                    android:textColor="#222222"
1165
                    android:textSize="10sp"
1168
                    android:textSize="10sp"
1166
                    android:gravity="center_vertical|right"
1167
                    android:layout_width="match_parent"
1168
                    android:layout_height="match_parent"/>
1169
                    tools:text="18:00开始 1.45元/度" />
1169
            </LinearLayout>
1170
            </LinearLayout>
1170
1171
1171
            <TextView
1172
            <TextView
1229
                        android:layout_centerInParent="true"
1230
                        android:layout_centerInParent="true"
1230
                        android:orientation="horizontal">
1231
                        android:orientation="horizontal">
1231
1232
1232
                        <TextView
1233
                        <ImageView
1233
                            android:layout_width="wrap_content"
1234
                            android:layout_width="wrap_content"
1234
                            android:layout_height="wrap_content"
1235
                            android:layout_height="wrap_content"
1235
                            android:layout_gravity="center"
1236
                            android:text="快充"
1237
                            android:textColor="@color/ui_68"
1238
                            android:textSize="12sp" />
1236
                            android:layout_gravity="center_vertical"
1237
                            android:paddingRight="10dp"
1238
                            android:src="@drawable/fast_icon" />
1239
1239
1240
                        <TextView
1240
                        <TextView
1241
                            android:id="@+id/window_tv_fast_num"
1241
                            android:id="@+id/window_tv_fast_free_label"
1242
                            android:layout_width="wrap_content"
1242
                            android:layout_width="wrap_content"
1243
                            android:layout_height="wrap_content"
1243
                            android:layout_height="wrap_content"
1244
                            android:layout_gravity="center"
1245
                            android:layout_marginLeft="13dp"
1246
                            android:text=""
1244
                            android:layout_gravity="center_vertical"
1245
                            android:text="闲"
1247
                            android:textColor="@color/ui_62"
1246
                            android:textColor="@color/ui_62"
1248
                            android:textSize="21sp" />
1249
1250
                        <TextView
1251
                            android:id="@+id/window_tv_fastable"
1252
                            android:layout_width="wrap_content"
1253
                            android:layout_height="wrap_content"
1254
                            android:layout_gravity="center"
1255
                            android:layout_marginLeft="24dp"
1256
                            android:text="空闲"
1257
                            android:textColor="@color/ui_68"
1258
                            android:textSize="12sp"
1259
                            android:visibility="visible" />
1247
                            android:textSize="14sp" />
1260
1248
1261
                        <TextView
1262
                            android:id="@+id/window_tv_fastable_num"
1249
                        <LinearLayout
1263
                            android:layout_width="wrap_content"
1250
                            android:layout_width="wrap_content"
1264
                            android:layout_height="wrap_content"
1251
                            android:layout_height="wrap_content"
1265
                            android:layout_gravity="center"
1266
                            android:layout_marginLeft="13dp"
1267
                            android:text=""
1268
                            android:textColor="@color/ui_62"
1269
                            android:textSize="21sp"
1270
                            android:visibility="visible" />
1271
1272
1252
                            android:layout_gravity="center_vertical"
1253
                            android:orientation="horizontal">
1254
1255
                            <TextView
1256
                                android:id="@+id/window_tv_fast_free_num"
1257
                                android:layout_width="wrap_content"
1258
                                android:layout_height="wrap_content"
1259
                                android:layout_gravity="bottom"
1260
                                android:paddingLeft="5dp"
1261
                                android:textColor="@color/ui_62"
1262
                                android:textSize="18sp"
1263
                                android:textStyle="bold"
1264
                                tools:text="13" />
1265
1266
                            <TextView
1267
                                android:id="@+id/window_tv_fast_total_num"
1268
                                android:layout_width="wrap_content"
1269
                                android:layout_height="wrap_content"
1270
                                android:layout_gravity="bottom"
1271
                                android:paddingLeft="1dp"
1272
                                android:textColor="@color/ui_68"
1273
                                android:textSize="12sp"
1274
                                tools:text="/15" />
1275
                        </LinearLayout>
1273
                    </LinearLayout>
1276
                    </LinearLayout>
1274
1277
1275
                </RelativeLayout>
1278
                </RelativeLayout>
1291
                        android:layout_centerInParent="true"
1294
                        android:layout_centerInParent="true"
1292
                        android:orientation="horizontal">
1295
                        android:orientation="horizontal">
1293
1296
1294
                        <TextView
1297
                        <ImageView
1295
                            android:layout_width="wrap_content"
1298
                            android:layout_width="wrap_content"
1296
                            android:layout_height="wrap_content"
1299
                            android:layout_height="wrap_content"
1297
                            android:layout_gravity="center"
1298
                            android:text="慢充"
1299
                            android:textColor="@color/ui_68"
1300
                            android:textSize="12sp" />
1301
1300
                            android:layout_gravity="center_vertical"
1301
                            android:paddingRight="10dp"
1302
                            android:src="@drawable/slow_icon" />
1302
                        <TextView
1303
                        <TextView
1303
                            android:id="@+id/window_tv_slow_num"
1304
                            android:id="@+id/window_tv_slow_free_label"
1304
                            android:layout_width="wrap_content"
1305
                            android:layout_width="wrap_content"
1305
                            android:layout_height="wrap_content"
1306
                            android:layout_height="wrap_content"
1306
                            android:layout_gravity="center"
1307
                            android:layout_marginLeft="13dp"
1308
                            android:text=""
1307
                            android:layout_gravity="center_vertical"
1308
                            android:text="闲"
1309
                            android:textColor="@color/ui_62"
1309
                            android:textColor="@color/ui_62"
1310
                            android:textSize="21sp" />
1310
                            android:textSize="14sp" />
1311
1311
1312
                        <TextView
1313
                            android:id="@+id/window_tv_slowable"
1312
                        <LinearLayout
1314
                            android:layout_width="wrap_content"
1313
                            android:layout_width="wrap_content"
1315
                            android:layout_height="wrap_content"
1314
                            android:layout_height="wrap_content"
1316
                            android:layout_gravity="center"
1317
                            android:layout_marginLeft="24dp"
1318
                            android:text="空闲"
1319
                            android:textColor="@color/ui_68"
1320
                            android:textSize="12sp"
1321
                            android:visibility="visible" />
1322
1323
                        <TextView
1324
                            android:id="@+id/window_tv_slowable_num"
1325
                            android:layout_width="wrap_content"
1326
                            android:layout_height="wrap_content"
1327
                            android:layout_gravity="center"
1328
                            android:layout_marginLeft="13dp"
1329
                            android:text=""
1330
                            android:textColor="@color/ui_62"
1331
                            android:textSize="21sp"
1332
                            android:visibility="visible" />
1333
1334
1315
                            android:layout_gravity="center_vertical"
1316
                            android:orientation="horizontal">
1317
1318
                            <TextView
1319
                                android:id="@+id/window_tv_slow_free_num"
1320
                                android:layout_width="wrap_content"
1321
                                android:layout_height="wrap_content"
1322
                                android:layout_gravity="bottom"
1323
                                android:paddingLeft="5dp"
1324
                                android:textColor="@color/ui_62"
1325
                                android:textSize="18sp"
1326
                                android:textStyle="bold"
1327
                                tools:text="13" />
1328
1329
                            <TextView
1330
                                android:id="@+id/window_tv_slow_total_num"
1331
                                android:layout_width="wrap_content"
1332
                                android:layout_height="wrap_content"
1333
                                android:layout_gravity="bottom"
1334
                                android:paddingLeft="1dp"
1335
                                android:textColor="@color/ui_68"
1336
                                android:textSize="12sp"
1337
                                tools:text="/15" />
1338
                        </LinearLayout>
1335
                    </LinearLayout>
1339
                    </LinearLayout>
1336
1340
1337
                </RelativeLayout>
1341
                </RelativeLayout>