Browse Source

站点详情修改完成

huyuguo 5 years ago
parent
commit
17f36089fa

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

152
            }
152
            }
153
153
154
            holder.tvStaus.setText(status.getStatus());
154
            holder.tvStaus.setText(status.getStatus());
155
155
            if (status.getStatus().equals("空闲中")) {
156
            if (status.getStatus().equals("空闲中")) {
156
                holder.tvStaus.setBackgroundColor(MainApplication.context.getResources().getColor(R.color.lvse));
157
                holder.tvStaus.setBackgroundColor(MainApplication.context.getResources().getColor(R.color.lvse));
157
                holder.llZhuangControl.setVisibility(View.VISIBLE);
158
                holder.llZhuangControl.setVisibility(View.VISIBLE);
158
            } else if (status.getStatus().equals("充电中") || status.getStatus().equals("已预约")) {
159
            } else if (status.getStatus().equals("充电中") || status.getStatus().equals("已预约")) {
159
                holder.tvStaus.setBackgroundColor(MainApplication.context.getResources().getColor(R.color.juhuang));
160
                holder.tvStaus.setBackgroundColor(MainApplication.context.getResources().getColor(R.color.juhuang));
160
                holder.llZhuangControl.setVisibility(View.INVISIBLE);
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
                holder.tvStaus.setBackgroundColor(MainApplication.context.getResources().getColor(R.color.ui_68));
165
                holder.tvStaus.setBackgroundColor(MainApplication.context.getResources().getColor(R.color.ui_68));
163
                holder.llZhuangControl.setVisibility(View.INVISIBLE);
166
                holder.llZhuangControl.setVisibility(View.INVISIBLE);
164
            }
167
            }
181
            }
184
            }
182
            String type, power, have_gun;
185
            String type, power, have_gun;
183
            if ("1".equals(status.getEleType())) {
186
            if ("1".equals(status.getEleType())) {
184
                type = "快充";
187
                type = "直流快充";
185
            } else {
188
            } else {
186
                type = "慢充";
189
                type = "交流慢充";
187
            }
190
            }
188
            if ("0".equals(status.getPower())) {
191
            if ("0".equals(status.getPower())) {
189
                power = "";
192
                power = "";

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

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

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

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

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

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