Browse Source

优化站点列表的停车位费用展示

hy 4 years ago
parent
commit
c013d06896

+ 3 - 1
app/src/main/java/com/electric/chargingpile/activity/CarBrandActivity.java

25
import org.greenrobot.eventbus.EventBus;
25
import org.greenrobot.eventbus.EventBus;
26
26
27
import java.util.ArrayList;
27
import java.util.ArrayList;
28
28
/**
29
 * 车型品牌选择
30
 * */
29
public class CarBrandActivity extends AppCompatActivity implements View.OnClickListener {
31
public class CarBrandActivity extends AppCompatActivity implements View.OnClickListener {
30
32
31
    private LetterSideView letter_side_view;
33
    private LetterSideView letter_side_view;

+ 4 - 1
app/src/main/java/com/electric/chargingpile/activity/RecommendChargingStationActivity.java

204
            final TextView window_tv_slow_free_label;
204
            final TextView window_tv_slow_free_label;
205
            final TextView window_tv_slow_total_num;
205
            final TextView window_tv_slow_total_num;
206
            final TextView fenshi_info_textview;
206
            final TextView fenshi_info_textview;
207
            final TextView parkingFee;
207
208
208
            public ViewHolder(View itemView) {
209
            public ViewHolder(View itemView) {
209
                super(itemView);
210
                super(itemView);
232
                window_tv_slow_free_num = itemView.findViewById(R.id.window_tv_slow_free_num);
233
                window_tv_slow_free_num = itemView.findViewById(R.id.window_tv_slow_free_num);
233
                window_tv_slow_total_num = itemView.findViewById(R.id.window_tv_slow_total_num);
234
                window_tv_slow_total_num = itemView.findViewById(R.id.window_tv_slow_total_num);
234
                fenshi_info_textview = itemView.findViewById(R.id.fenshi_info_textview);
235
                fenshi_info_textview = itemView.findViewById(R.id.fenshi_info_textview);
236
                parkingFee = itemView.findViewById(R.id.parkingFee);
235
237
236
            }
238
            }
237
        }
239
        }
338
            holder.iv_label_public.setText(recommendZhan.getBelong_attribute());
340
            holder.iv_label_public.setText(recommendZhan.getBelong_attribute());
339
            holder.iv_label_ground.setText("0".equals(recommendZhan.getPark_location()) ? "地下" : "地上");
341
            holder.iv_label_ground.setText("0".equals(recommendZhan.getPark_location()) ? "地下" : "地上");
340
            holder.iv_label_free_park.setVisibility(recommendZhan.getStop_cost().contains("免费") ? View.VISIBLE : View.GONE);
342
            holder.iv_label_free_park.setVisibility(recommendZhan.getStop_cost().contains("免费") ? View.VISIBLE : View.GONE);
341
343
            holder.parkingFee.setText("停车费:"+recommendZhan.getStop_cost());
344
            holder.parkingFee.setVisibility(recommendZhan.getStop_cost().contains("免费") ? View.GONE : View.VISIBLE);
342
345
343
            if ("1".equals(recommendZhan.getOwn_pay())) {
346
            if ("1".equals(recommendZhan.getOwn_pay())) {
344
                holder.payment_method.setText("可使用本APP扫码支付");
347
                holder.payment_method.setText("可使用本APP扫码支付");

+ 5 - 5
app/src/main/res/layout/activity_user_center.xml

57
57
58
            <com.electric.chargingpile.view.RoundImageView
58
            <com.electric.chargingpile.view.RoundImageView
59
                android:id="@+id/user"
59
                android:id="@+id/user"
60
                android:layout_width="67dp"
61
                android:layout_height="67dp"
60
                android:layout_width="60dp"
61
                android:layout_height="60dp"
62
                android:scaleType="fitXY"
62
                android:scaleType="fitXY"
63
                android:layout_gravity="center"
63
                android:layout_gravity="center"
64
                app:type="circle"
64
                app:type="circle"
154
            android:layout_width="wrap_content"
154
            android:layout_width="wrap_content"
155
            android:layout_height="wrap_content"
155
            android:layout_height="wrap_content"
156
            android:layout_alignParentRight="true"
156
            android:layout_alignParentRight="true"
157
            android:layout_alignBottom="@+id/ll_noLogin"
157
            android:layout_marginTop="25dp"
158
            android:src="@drawable/icon_qiandaohavegift"
158
            android:src="@drawable/icon_qiandaohavegift"
159
            android:layout_marginRight="6dp"/>
159
            android:layout_marginRight="6dp"/>
160
160
172
172
173
            <com.electric.chargingpile.view.RoundImageView
173
            <com.electric.chargingpile.view.RoundImageView
174
                android:id="@+id/user_default"
174
                android:id="@+id/user_default"
175
                android:layout_width="67dp"
176
                android:layout_height="67dp"
175
                android:layout_width="60dp"
176
                android:layout_height="60dp"
177
                android:layout_alignParentTop="true"
177
                android:layout_alignParentTop="true"
178
                android:layout_alignParentStart="true"
178
                android:layout_alignParentStart="true"
179
                android:layout_gravity="center"
179
                android:layout_gravity="center"

+ 5 - 2
app/src/main/res/layout/recommend_charging_station_item.xml

212
        </LinearLayout>
212
        </LinearLayout>
213
    </LinearLayout>
213
    </LinearLayout>
214
    <TextView
214
    <TextView
215
        android:visibility="gone"
216
        android:id="@+id/parkingFee"
217
        android:layout_marginEnd="15dp"
215
        android:layout_marginTop="15dp"
218
        android:layout_marginTop="15dp"
216
        android:layout_marginLeft="15dp"
219
        android:layout_marginStart="15dp"
217
        android:layout_width="wrap_content"
220
        android:layout_width="wrap_content"
218
        android:layout_height="wrap_content"
221
        android:layout_height="wrap_content"
219
        android:text="停车费:以实际收费为准"
222
        tools:text="停车费:以实际收费为准"
220
        android:textColor="@color/color_ffe32727"
223
        android:textColor="@color/color_ffe32727"
221
        android:textSize="13sp"
224
        android:textSize="13sp"
222
        />
225
        />