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

app/src/main/java/com/electric/chargingpile/activity/MainMapActivity.java

@@ -365,8 +365,8 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
    public static zhan_list current_chargePoint;
    public static Marker nMarker;
    private boolean paoShow = false;
    private TextView windowName, windowGrade, windowCost, windowFastNum, windowFastAble, windowFastAbleNum,
            windowSlowNum, windowSlowAble, windowSlowAbleNum, windowCommentNum, windowDistance, stopCost;
    private TextView windowName, windowGrade, windowCost, window_tv_fast_free_num,window_tv_fast_free_label,window_tv_fast_total_num,
            window_tv_slow_free_label,window_tv_slow_free_num,window_tv_slow_total_num, windowCommentNum, windowDistance, stopCost;
    private RelativeLayout windowGo, windowZhanDetails, windowComments;
    private ImageView windowAd, windowGradeImg;
    public static RelativeLayout windowLayout;
@@ -1228,12 +1228,13 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
        stopCost = findViewById(R.id.window_tv_stop_cost);
        windowGrade = (TextView) findViewById(R.id.window_tv_zhan_grade);
        windowCost = (TextView) findViewById(R.id.window_tv_zhan_cost);
        windowFastNum = (TextView) findViewById(R.id.window_tv_fast_num);
        windowFastAble = (TextView) findViewById(R.id.window_tv_fastable);
        windowFastAbleNum = (TextView) findViewById(R.id.window_tv_fastable_num);
        windowSlowNum = (TextView) findViewById(R.id.window_tv_slow_num);
        windowSlowAble = (TextView) findViewById(R.id.window_tv_slowable);
        windowSlowAbleNum = (TextView) findViewById(R.id.window_tv_slowable_num);
        window_tv_fast_free_num = (TextView) findViewById(R.id.window_tv_fast_free_num);
        window_tv_fast_free_label = findViewById(R.id.window_tv_fast_free_label);
        window_tv_fast_total_num = findViewById(R.id.window_tv_fast_total_num);
        window_tv_slow_free_label = findViewById(R.id.window_tv_slow_free_label);
        window_tv_slow_free_num = findViewById(R.id.window_tv_slow_free_num);
        window_tv_slow_total_num = findViewById(R.id.window_tv_slow_total_num);
        windowCommentNum = (TextView) findViewById(R.id.window_tv_comment_num);
//        windowDistance = (TextView) findViewById(R.id.window_tv_zhan_distance);
        windowChargeRecordCnt = findViewById(R.id.window_tv_charge_record_cnt);
@@ -5230,11 +5231,11 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
        if ("1".equals(fenshi_is)) {
            final String fenshi_info = JsonUtils.getKeyResult(info, "fenshi_info");
            ArrayList<PileData.FenshiInfoBean> fenshiList = (ArrayList<PileData.FenshiInfoBean>)JsonUtils.parseToObjectList(fenshi_info, PileData.FenshiInfoBean.class);
            ArrayList<PileData.FenshiInfoBean> fenshiList = (ArrayList<PileData.FenshiInfoBean>) JsonUtils.parseToObjectList(fenshi_info, PileData.FenshiInfoBean.class);
            Calendar calendar = Calendar.getInstance();
            int hours = calendar.get(Calendar.HOUR_OF_DAY);
            int minutes = calendar.get(Calendar.MINUTE);
            int totalMinutes =  hours* 60 + minutes;
            int totalMinutes = hours * 60 + minutes;
            TextView fenshi_info_textview = findViewById(R.id.fenshi_info_textview);
            for (PileData.FenshiInfoBean bean : fenshiList) {
@@ -5356,35 +5357,31 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
        }
        if (null != acableNum && null != acNum
                && null != dcableNum && null != dcNum) {
            windowFastNum.setText(dcNum);
            windowFastAbleNum.setText(dcableNum);
            windowFastAble.setVisibility(View.VISIBLE);
            windowFastAbleNum.setVisibility(View.VISIBLE);
            windowSlowNum.setText(acNum);
            windowSlowAbleNum.setText(acableNum);
            windowSlowAble.setVisibility(View.VISIBLE);
            windowSlowAbleNum.setVisibility(View.VISIBLE);
//            paoSlow.setText("空闲" + acableNum + "/共" + acNum + "个");
//            paoFast.setText("空闲" + dcableNum + "/共" + dcNum + "个");
        } else {
                && null != dcableNum && null != dcNum) { // 有桩状态
            window_tv_fast_free_num.setText(dcableNum); // 快充空闲桩数量
            window_tv_fast_total_num.setText("/" + dcNum); // 快充桩总数
            window_tv_fast_free_label.setVisibility(View.VISIBLE);
            window_tv_fast_total_num.setVisibility(View.VISIBLE);
            window_tv_slow_free_num.setText(acableNum); // 慢充空闲桩数量
            window_tv_slow_total_num.setText("/" + acNum);
            window_tv_slow_free_label.setVisibility(View.VISIBLE);
            window_tv_slow_total_num.setVisibility(View.VISIBLE);
        } else { // 没有桩状态
            if (fast_num.equals("")) {
                windowFastNum.setText("0");
                window_tv_fast_free_num.setText("0");
            } else {
                windowFastNum.setText(fast_num);
                window_tv_fast_free_num.setText(fast_num);
            }
            windowFastAble.setVisibility(View.GONE);
            windowFastAbleNum.setVisibility(View.GONE);
            window_tv_fast_free_label.setVisibility(View.GONE);
            window_tv_fast_total_num.setVisibility(View.GONE);
            if (slow_num.equals("")) {
                windowSlowNum.setText("0");
                window_tv_slow_free_num.setText("0");
            } else {
                windowSlowNum.setText(slow_num);
                window_tv_slow_free_num.setText(slow_num);
            }
            windowSlowAble.setVisibility(View.GONE);
            windowSlowAbleNum.setVisibility(View.GONE);
            window_tv_slow_free_label.setVisibility(View.GONE);
            window_tv_slow_total_num.setVisibility(View.GONE);
        }

app/src/main/res/layout/activity_main_map.xml

@@ -1158,14 +1158,15 @@
                    android:text="免费停车"
                    android:textColor="#828282"
                    android:textSize="11dp" />
                <TextView
                    android:id="@+id/fenshi_info_textview"
                    tools:text="18:00开始 1.4775元/度"
                    android:layout_width="match_parent"
                    android:layout_height="match_parent"
                    android:gravity="center_vertical|right"
                    android:textColor="#222222"
                    android:textSize="10sp"
                    android:gravity="center_vertical|right"
                    android:layout_width="match_parent"
                    android:layout_height="match_parent"/>
                    tools:text="18:00开始 1.45元/度" />
            </LinearLayout>
            <TextView
@@ -1229,47 +1230,49 @@
                        android:layout_centerInParent="true"
                        android:orientation="horizontal">
                        <TextView
                        <ImageView
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:layout_gravity="center"
                            android:text="快充"
                            android:textColor="@color/ui_68"
                            android:textSize="12sp" />
                            android:layout_gravity="center_vertical"
                            android:paddingRight="10dp"
                            android:src="@drawable/fast_icon" />
                        <TextView
                            android:id="@+id/window_tv_fast_num"
                            android:id="@+id/window_tv_fast_free_label"
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:layout_gravity="center"
                            android:layout_marginLeft="13dp"
                            android:text=""
                            android:layout_gravity="center_vertical"
                            android:text="闲"
                            android:textColor="@color/ui_62"
                            android:textSize="21sp" />
                        <TextView
                            android:id="@+id/window_tv_fastable"
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:layout_gravity="center"
                            android:layout_marginLeft="24dp"
                            android:text="空闲"
                            android:textColor="@color/ui_68"
                            android:textSize="12sp"
                            android:visibility="visible" />
                            android:textSize="14sp" />
                        <TextView
                            android:id="@+id/window_tv_fastable_num"
                        <LinearLayout
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:layout_gravity="center"
                            android:layout_marginLeft="13dp"
                            android:text=""
                            android:textColor="@color/ui_62"
                            android:textSize="21sp"
                            android:visibility="visible" />
                            android:layout_gravity="center_vertical"
                            android:orientation="horizontal">
                            <TextView
                                android:id="@+id/window_tv_fast_free_num"
                                android:layout_width="wrap_content"
                                android:layout_height="wrap_content"
                                android:layout_gravity="bottom"
                                android:paddingLeft="5dp"
                                android:textColor="@color/ui_62"
                                android:textSize="18sp"
                                android:textStyle="bold"
                                tools:text="13" />
                            <TextView
                                android:id="@+id/window_tv_fast_total_num"
                                android:layout_width="wrap_content"
                                android:layout_height="wrap_content"
                                android:layout_gravity="bottom"
                                android:paddingLeft="1dp"
                                android:textColor="@color/ui_68"
                                android:textSize="12sp"
                                tools:text="/15" />
                        </LinearLayout>
                    </LinearLayout>
                </RelativeLayout>
@@ -1291,47 +1294,48 @@
                        android:layout_centerInParent="true"
                        android:orientation="horizontal">
                        <TextView
                        <ImageView
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:layout_gravity="center"
                            android:text="慢充"
                            android:textColor="@color/ui_68"
                            android:textSize="12sp" />
                            android:layout_gravity="center_vertical"
                            android:paddingRight="10dp"
                            android:src="@drawable/slow_icon" />
                        <TextView
                            android:id="@+id/window_tv_slow_num"
                            android:id="@+id/window_tv_slow_free_label"
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:layout_gravity="center"
                            android:layout_marginLeft="13dp"
                            android:text=""
                            android:layout_gravity="center_vertical"
                            android:text="闲"
                            android:textColor="@color/ui_62"
                            android:textSize="21sp" />
                            android:textSize="14sp" />
                        <TextView
                            android:id="@+id/window_tv_slowable"
                        <LinearLayout
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:layout_gravity="center"
                            android:layout_marginLeft="24dp"
                            android:text="空闲"
                            android:textColor="@color/ui_68"
                            android:textSize="12sp"
                            android:visibility="visible" />
                        <TextView
                            android:id="@+id/window_tv_slowable_num"
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:layout_gravity="center"
                            android:layout_marginLeft="13dp"
                            android:text=""
                            android:textColor="@color/ui_62"
                            android:textSize="21sp"
                            android:visibility="visible" />
                            android:layout_gravity="center_vertical"
                            android:orientation="horizontal">
                            <TextView
                                android:id="@+id/window_tv_slow_free_num"
                                android:layout_width="wrap_content"
                                android:layout_height="wrap_content"
                                android:layout_gravity="bottom"
                                android:paddingLeft="5dp"
                                android:textColor="@color/ui_62"
                                android:textSize="18sp"
                                android:textStyle="bold"
                                tools:text="13" />
                            <TextView
                                android:id="@+id/window_tv_slow_total_num"
                                android:layout_width="wrap_content"
                                android:layout_height="wrap_content"
                                android:layout_gravity="bottom"
                                android:paddingLeft="1dp"
                                android:textColor="@color/ui_68"
                                android:textSize="12sp"
                                tools:text="/15" />
                        </LinearLayout>
                    </LinearLayout>
                </RelativeLayout>