修改直流桩可显示电压，交流只显示功率

app/src/main/java/com/electric/chargingpile/adapter/ZhuangStatusadapter.java

@@ -167,32 +167,16 @@ public class ZhuangStatusadapter extends BaseAdapter {
            }
            holder.llZhuangControl.setVisibility(View.GONE);
            if ("0".equals(status.getNationalStandard())) {
                holder.tvType.setVisibility(View.GONE);
            } else {
                holder.tvType.setVisibility(View.VISIBLE);
                switch (status.getNationalStandard()) {
                    case "1":
                        holder.tvType.setText("国标2011");
                        break;
                    case "2":
                        holder.tvType.setText("国标2015");
                        break;
                    case "3":
                        holder.tvType.setText("国标2015，国标2011");
                }
            }
            String type, power, have_gun;
            if ("1".equals(status.getEleType())) {
                type = "直流快充";
                power= status.getPower()+ "kw"+"/"+ status.getWattmeter()+"V";
            } else {
                type = "交流慢充";
                power= status.getPower()+ "kw";
            }
            if ("0".equals(status.getPower())) {
                power = "";
            } else {
                power = " | " + status.getPower() + "kw";
            }
            holder.tvType.setText(power);
            //"has_gun": "0",//1有枪，2没有枪,0 没有这个桩的信息
            switch (status.getHas_gun()) {
                case "1":
@@ -205,7 +189,30 @@ public class ZhuangStatusadapter extends BaseAdapter {
                    have_gun = "";
                    break;
            }
            holder.tvInfo.setText(type + power + have_gun);
            String gbFormat="";
            switch (status.getNationalStandard()) {
                case "1":
                    gbFormat=" | 国标2011";
                    break;
                case "2":
                    gbFormat=(" | 国标2015");
                    break;
                case "3":
                    gbFormat=(" | 国标2015，国标2011");
            }
            StringBuilder builderStr = new StringBuilder();
            if (gbFormat==""){
                builderStr.append(type)
                        .append(have_gun);
            }else{
                builderStr.append(type)
                        .append(gbFormat)
                        .append(have_gun);
            }
            holder.tvInfo.setText(builderStr);
        } catch (Exception e) {
            e.printStackTrace();
        }

app/src/main/java/com/electric/chargingpile/data/ZhuangStatus.java

@@ -20,6 +20,7 @@ public class ZhuangStatus {
     * soc : 0
     * nationalStandard : 1
     * order : 1
     * wattmeter :177   功率
     */
    private String pile_id;
@@ -34,8 +35,17 @@ public class ZhuangStatus {
    private String status;
    private String soc;
    private String nationalStandard;
    private String wattmeter;
    private int order;
    public String getWattmeter() {
        return wattmeter;
    }
    public void setWattmeter(String wattmeter) {
        this.wattmeter = wattmeter;
    }
    public String getPile_id() {
        return pile_id;
    }

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

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
    android:id="@+id/rl_layout"
    android:orientation="vertical"
    android:layout_width="match_parent"
@@ -8,6 +9,8 @@
    android:minHeight="96dp">
    <TextView
        tools:textColor="#f1f1"
        tools:text="空闲"
        android:id="@+id/tv_zhuang_staus"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
@@ -70,22 +73,26 @@
        android:layout_marginRight="15dp">
        <TextView
            android:textStyle="bold"
            tools:text="桩编码：1101050408103"
            android:id="@+id/tv_pile_id"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:singleLine="true"
            android:ellipsize="end"
            android:textColor="@color/ui_62"
            android:textColor="@color/color_text"
            android:textSize="14sp"
            android:layout_marginBottom="6dp"/>
        <TextView
            tools:text="90w"
            android:id="@+id/tv_zhuang_type"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:singleLine="true"
            android:ellipsize="end"
            android:textColor="@color/ui_65"
            android:textColor="@color/color_text"
            android:textSize="12sp"
            android:layout_marginBottom="4dp"/>
@@ -127,10 +134,11 @@
        </LinearLayout>
        <TextView
            tools:text="直流快充 | 国标2015 | 有枪 "
            android:id="@+id/tv_zhuang_info"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:textColor="@color/ui_65"
            android:textColor="@color/color_text"
            android:textSize="12sp"
            android:layout_marginBottom="15dp"/>

app/src/main/res/values/color.xml

@@ -203,6 +203,7 @@
    <color name="color_e32727">#ffe32727</color>
    <color name="color_707070">#ff707070</color>
    <color name="color_f5f6f7">#F5F6F7</color>
    <color name="color_text">#1A1B1F</color>