Pārlūkot izejas kodu

添加地锁状态

hy 1 gadu atpakaļ
vecāks
revīzija
d43181819b

+ 1 - 0
app/src/main/java/com/electric/chargingpile/activity/NewZhanDetailsActivity.java

@ -354,6 +354,7 @@ public class NewZhanDetailsActivity extends AppCompatActivity implements View.On
354 354
            jingdu = getIntent().getStringExtra("poi_jing");
355 355
            weidu = getIntent().getStringExtra("poi_wei");
356 356
        }
357
//        zhan_id = "10005111174933";
357 358
        getZhanCommentNum(zhan_id);
358 359
359 360

+ 39 - 5
app/src/main/java/com/electric/chargingpile/adapter/LockAdapter.java

@ -4,6 +4,7 @@ import android.content.Context;
4 4
import android.view.LayoutInflater;
5 5
import android.view.View;
6 6
import android.view.ViewGroup;
7
import android.widget.TextView;
7 8
8 9
import androidx.annotation.NonNull;
9 10
import androidx.recyclerview.widget.RecyclerView;
@ -28,27 +29,60 @@ public class LockAdapter extends RecyclerView.Adapter<LockAdapter.LockHodler> {
28 29
    @Override
29 30
    public LockHodler onCreateViewHolder(@NonNull @NotNull ViewGroup parent, int viewType) {
30 31
        View inflate = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_lock, parent, false);
31
        ViewGroup.LayoutParams layoutParams = inflate.getLayoutParams();
32
        ViewGroup.LayoutParams newParams = inflate.getLayoutParams();
32 33
        int width = (int) (mScreenWidth / 5F) - 24;
33
        layoutParams.width = width;
34
        layoutParams.height = width;
35
        inflate.setLayoutParams(layoutParams);
34
        newParams.width = width;
35
        newParams.height = width;
36
        inflate.setLayoutParams(newParams);
36 37
        return new LockHodler(inflate);
37 38
    }
38 39
39 40
    @Override
40 41
    public void onBindViewHolder(@NonNull @NotNull LockHodler holder, int position) {
42
        setStatus(holder.tvStatus,1);
43
    }
41 44
45
    private void setStatus(TextView textView,int status){
46
        textView.setVisibility(View.VISIBLE);
47
        switch (status){
48
            case 1:
49
                textView.setText("空闲");
50
                textView.setBackgroundResource(R.drawable.bg_status_free);
51
                break;
52
            case 2:
53
                textView.setText("占用");
54
                textView.setBackgroundResource(R.drawable.bg_status_occupy);
55
                break;
56
            case 3:
57
                textView.setText("维修");
58
                textView.setBackgroundResource(R.drawable.bg_status_repair);
59
                break;
60
            case 4:
61
                textView.setText("离网");
62
                textView.setBackgroundResource(R.drawable.bg_status_off_network);
63
                break;
64
            case 5:
65
                textView.setText("异常");
66
                textView.setBackgroundResource(R.drawable.bg_status_off_network);
67
                break;
68
            default:
69
                textView.setVisibility(View.GONE);
70
                break;
71
        }
42 72
    }
43 73
44 74
    @Override
45 75
    public int getItemCount() {
46
        return 7;
76
        return 50;
47 77
    }
48 78
49 79
    public class LockHodler extends RecyclerView.ViewHolder {
80
        private final TextView tvStatus,tvOrder;
81
50 82
        public LockHodler(@NonNull @NotNull View itemView) {
51 83
            super(itemView);
84
            tvStatus = itemView.findViewById(R.id.tvStatus);
85
            tvOrder = itemView.findViewById(R.id.tvOrder);
52 86
        }
53 87
    }
54 88
}

+ 6 - 0
app/src/main/java/com/electric/chargingpile/fragment/DetailsFragment.java

@ -50,6 +50,7 @@ import com.electric.chargingpile.activity.ZhanDetailsNew;
50 50
import com.electric.chargingpile.adapter.ZhanCommentsAapter;
51 51
import com.electric.chargingpile.application.MainApplication;
52 52
import com.electric.chargingpile.data.ChartData;
53
import com.electric.chargingpile.data.LocksBean;
53 54
import com.electric.chargingpile.data.MyOtto;
54 55
import com.electric.chargingpile.data.PileData;
55 56
import com.electric.chargingpile.data.RankinglistRefreshEvent;
@ -286,9 +287,12 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
286 287
                        zongjia = JsonUtils.getKeyResult(info_decode, "zongjia");
287 288
                        String park_location = JsonUtils.getKeyResult(info_decode, "park_location");
288 289
                        String own_pay = JsonUtils.getKeyResult(info_decode, "own_pay");
290
                        String locks = JsonUtils.getKeyResult(info, "locks");
291
                        ArrayList<LocksBean> locksBeans = (ArrayList<LocksBean>) JsonUtils.parseToObjectList(locks, LocksBean.class);
289 292
                        if (detailsFragmentListener != null) {
290 293
                            detailsFragmentListener.updateScanCharge(own_pay);
291 294
                        }
295
                        imgLock.setVisibility((locksBeans != null && locksBeans.size() != 0) ? View.VISIBLE : View.GONE);
292 296
293 297
                        if ("1".equals(own_pay)) {
294 298
                            scan_charge_btn.setVisibility(View.VISIBLE);
@ -769,6 +773,7 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
769 773
    private Space scan_charge_space;
770 774
    private String telNum;
771 775
    private RelativeLayout rl_new_comment;
776
    private ImageView imgLock;
772 777
773 778
    @Override
774 779
    public View onCreateView(LayoutInflater inflater, ViewGroup container,
@ -926,6 +931,7 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
926 931
         fl_ptag = (TagFlowLayout) v.findViewById(R.id.fl_ptag);
927 932
         parent = (RelativeLayout) v.findViewById(R.id.parent);
928 933
         imgLayout = (RelativeLayout) v.findViewById(R.id.imgLayout);
934
         imgLock = (ImageView) v.findViewById(R.id.imgLock);
929 935
    }
930 936
931 937
    @Override

+ 0 - 1
app/src/main/java/com/electric/chargingpile/view/LockStatusDialog.java

@ -123,7 +123,6 @@ public class LockStatusDialog extends BottomSheetDialogFragment {
123 123
            intent.setData(Uri.parse("tel:" + telNum));
124 124
            startActivity(intent);
125 125
        } else {
126
            LogUtils.e("@@@@@@@");
127 126
            // Ask for one permission
128 127
            EasyPermissions.requestPermissions(
129 128
                    this,

BIN
app/src/main/res/drawable-xxhdpi/ic_lowering_lock.webp


+ 9 - 0
app/src/main/res/drawable/bg_item_lock.xml

@ -0,0 +1,9 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3
    <item >
4
        <shape android:shape="rectangle">
5
            <solid android:color="#F9F9F9" />
6
            <corners android:radius="3dp" />
7
        </shape>
8
    </item>
9
</selector>

+ 9 - 0
app/src/main/res/drawable/bg_status_free.xml

@ -0,0 +1,9 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3
    <item >
4
        <shape android:shape="rectangle">
5
            <solid android:color="#ff3ec34c" />
6
            <corners android:topRightRadius="3dp"/>
7
        </shape>
8
    </item>
9
</selector>

+ 9 - 0
app/src/main/res/drawable/bg_status_occupy.xml

@ -0,0 +1,9 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3
    <item >
4
        <shape android:shape="rectangle">
5
            <solid android:color="#fff09e38" />
6
            <corners android:topRightRadius="3dp"/>
7
        </shape>
8
    </item>
9
</selector>

+ 9 - 0
app/src/main/res/drawable/bg_status_off_network.xml

@ -0,0 +1,9 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3
    <item >
4
        <shape android:shape="rectangle" >
5
            <solid android:color="#ffa5a5a5" />
6
            <corners android:topRightRadius="3dp"/>
7
        </shape>
8
    </item>
9
</selector>

+ 9 - 0
app/src/main/res/drawable/bg_status_repair.xml

@ -0,0 +1,9 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3
    <item >
4
        <shape android:shape="rectangle">
5
            <solid android:color="#ffe32727" />
6
            <corners android:topRightRadius="3dp"/>
7
        </shape>
8
    </item>
9
</selector>

+ 10 - 0
app/src/main/res/layout/fragmen_details_new.xml

@ -716,6 +716,16 @@
716 716
    </com.electric.chargingpile.view.CustomScrollView>
717 717
718 718
    <ImageView
719
        android:id="@+id/imgLock"
720
        tools:visibility="visible"
721
        android:visibility="gone"
722
        android:layout_marginBottom="20dp"
723
        android:layout_width="wrap_content"
724
        android:layout_height="wrap_content"
725
        android:src="@drawable/ic_lowering_lock"
726
        app:layout_constraintBottom_toTopOf="@+id/scan_charge_btn"
727
        app:layout_constraintEnd_toEndOf="@+id/scan_charge_btn" />
728
    <ImageView
719 729
        android:id="@+id/scan_charge_btn"
720 730
        android:layout_width="wrap_content"
721 731
        android:layout_height="wrap_content"

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

@ -4,7 +4,7 @@
4 4
    xmlns:tools="http://schemas.android.com/tools"
5 5
    xmlns:app="http://schemas.android.com/apk/res-auto"
6 6
    tools:background="#f1f"
7
    android:background="#f1f1"
7
    android:background="@drawable/bg_item_lock"
8 8
    android:layout_marginTop="5dp"
9 9
    android:layout_height="match_parent">
10 10
    <TextView