Browse Source

站点详情修改完成

huyuguo 4 years ago
parent
commit
17f36089fa

+ 6 - 3
app/src/main/java/com/electric/chargingpile/adapter/ZhuangStatusadapter.java

@ -152,13 +152,16 @@ public class ZhuangStatusadapter extends BaseAdapter {
152 152
            }
153 153
154 154
            holder.tvStaus.setText(status.getStatus());
155
155 156
            if (status.getStatus().equals("空闲中")) {
156 157
                holder.tvStaus.setBackgroundColor(MainApplication.context.getResources().getColor(R.color.lvse));
157 158
                holder.llZhuangControl.setVisibility(View.VISIBLE);
158 159
            } else if (status.getStatus().equals("充电中") || status.getStatus().equals("已预约")) {
159 160
                holder.tvStaus.setBackgroundColor(MainApplication.context.getResources().getColor(R.color.juhuang));
160 161
                holder.llZhuangControl.setVisibility(View.INVISIBLE);
161
            } else {
162
            } else if (status.getStatus().equals("已插枪")) {
163
                holder.tvStaus.setBackgroundColor(MainApplication.context.getResources().getColor(R.color.status_blue));
164
            }else {
162 165
                holder.tvStaus.setBackgroundColor(MainApplication.context.getResources().getColor(R.color.ui_68));
163 166
                holder.llZhuangControl.setVisibility(View.INVISIBLE);
164 167
            }
@ -181,9 +184,9 @@ public class ZhuangStatusadapter extends BaseAdapter {
181 184
            }
182 185
            String type, power, have_gun;
183 186
            if ("1".equals(status.getEleType())) {
184
                type = "快充";
187
                type = "直流快充";
185 188
            } else {
186
                type = "慢充";
189
                type = "交流慢充";
187 190
            }
188 191
            if ("0".equals(status.getPower())) {
189 192
                power = "";

+ 1 - 1
app/src/main/res/layout/activity_new_zhan_details.xml

@ -34,7 +34,7 @@
34 34
                android:layout_height="match_parent"
35 35
                android:layout_marginLeft="22dp"
36 36
                android:gravity="center"
37
                android:text="状态"
37
                android:text="状态"
38 38
                android:textColor="@color/ui_62"
39 39
                android:textSize="16sp" />
40 40

+ 1 - 1
app/src/main/res/layout/dialog_hongbao.xml

@ -36,7 +36,7 @@
36 36
            android:layout_gravity="center_horizontal"
37 37
            android:layout_marginBottom="37dp"
38 38
            android:gravity="center_horizontal"
39
            android:text="分享成功后您可自动取随机红包哦"
39
            android:text="分享成功后您可自动取随机红包哦"
40 40
            android:textColor="@color/ui_65"
41 41
            android:textSize="15sp" />
42 42

+ 1 - 0
app/src/main/res/values/color.xml

@ -132,6 +132,7 @@
132 132
    <color name="editcolor">#333333</color>
133 133
    <color name="juhuang">#ff9a00</color>
134 134
    <color name="lvse">#01b637</color>
135
    <color name="status_blue">#487FFF</color>
135 136
    <color name="juse">#ff9e05</color>
136 137
    <color name="ogreen">#c5ecd0</color>
137 138
    <color name="jieri">#fd3938</color>