From 32ff2cf6b3e617125152131fd420a8f2ae260064 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Fri, 20 Nov 2020 12:28:23 +0800 Subject: [PATCH] merger --- .../adapter/V2XSurroundingDetailAdapter.java | 52 ++++++++- .../main/res/drawable-mdpi/v2x_back_image.png | Bin 0 -> 1687 bytes ...odule_event_panel_fragment_surrounding.xml | 18 +-- ...dule_v2x_event_surrounding_detail_item.xml | 106 ++++++++++++------ 4 files changed, 129 insertions(+), 47 deletions(-) create mode 100644 modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_back_image.png diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingDetailAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingDetailAdapter.java index 62431f4d62..b7a6665727 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingDetailAdapter.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingDetailAdapter.java @@ -6,15 +6,21 @@ import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; + import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; import com.mogo.module.common.entity.MarkerExploreWay; import com.mogo.module.common.entity.MarkerPoiTypeEnum; import com.mogo.module.v2x.R; +import com.mogo.module.v2x.V2XConst; import com.mogo.module.v2x.adapter.holder.V2XSurroundingDetailVH; import com.mogo.module.v2x.entity.panel.SurroundingConstruction; +import com.mogo.module.v2x.utils.RoadConditionUtils; +import com.mogo.module.v2x.view.HeartLikeView; +import com.mogo.module.v2x.view.HeartUnLikeView; import com.mogo.utils.DateTimeUtils; +import com.mogo.utils.logger.Logger; import java.util.List; @@ -26,10 +32,12 @@ import java.util.List; public class V2XSurroundingDetailAdapter extends RecyclerView.Adapter { private List markerExploreWays; private Context mContext; - private ImageView mTypeImageView; private TextView mTypeTv; private TextView mAddressTv; + private TextView mUserNameTv; private TextView mTimeTv; + private HeartLikeView mHeartLikeView; + private HeartUnLikeView mUnHeartLikeView; public V2XSurroundingDetailAdapter(Context context, List list) { @@ -57,18 +65,52 @@ public class V2XSurroundingDetailAdapter extends RecyclerView.Adapter { + Logger.d(V2XConst.MODULE_NAME, "反馈有用"); + roadReportTrue(exploreWay); + }); + + mUnHeartLikeView.setOnClickCallListener(v -> { + Logger.d(V2XConst.MODULE_NAME, "反馈无用"); + roadReportErr(exploreWay); + }); } + /** + * 反馈路况正确 + */ + private void roadReportTrue(MarkerExploreWay exploreWay) { + if (exploreWay != null) { + RoadConditionUtils.sendShareReceiverInfo( + exploreWay.getInfoId(), + exploreWay.getPoiType(), + 2); + } + } + + /** + * 反馈路况错误 + */ + private void roadReportErr(MarkerExploreWay exploreWay) { + if (exploreWay != null) { + RoadConditionUtils.sendShareReceiverInfo( + exploreWay.getInfoId(), + exploreWay.getPoiType(), + 3); + } + } @Override public int getItemCount() { @@ -113,4 +155,6 @@ public class V2XSurroundingDetailAdapter extends RecyclerView.AdapterPx*QAtEWR9FeUSY1pURTO4-mVf!Nlpkpjq*YoagajxB(gcMjU=*7)(Fa4SCZ@*p zg~X7k4<;sRL?3)IHYP?*`hdQu7=zJNl0u=B3N~6Kr3o!Rr4Kexm8Dx?{l0O}^zQ7; z?9B4B$>yAU?m6E%bMD`{Hz_IdYiw*Rt*NOwE^Qx~>gwt@L_j(*G4ZaSnj&m#Yil4+ zMXjKq;Al7;&d$ilNSU0Rye3Niix)3`!N$tUN{F4(q5EJ%^+O+`kc5a{MMGEgH8(f! zTUuIr*60P}7r}`WCtj8gzc4vDIc388R40azjM_o(Mp#x3#Zto5l~n{$U_hr%o%&ST zq#C~mDM}L|mGblRQ+s=RzZIEKA~WdMML^2*ojiH+t)8BqH&wY2vsEanV$=spM}2+$ zvAcKgmZzkojE{_r{48=(H^?ENerPDi3jvB@7`*4NtE+pFR_0%KclSGrOpm~F_^4>k z1PzS|ASiZy{5MH(6!I@8h7(L6OZH6!xz@$nDz zuZ)*E4F50Z&Yc_9Xt}t!c($yptaxp0ZI>VkO;1n%WO#V^3fsmAN~cid{{@6sENwdq zuczVlnz=s;7<1^!J9q9>o0Z(QWkFHj0FIXrx8P}MX;(3^d-c4z1?A#wX=yo@m6a8o zo}Qkwa>m?a4DR=F3E}fAtdvAXKyFEwE?xS*zrTN2bP~F51!i`yLFJ8oBNeID_%oD#yR5j1x|gDMRLmk7G*@wT{lK9{dQEA zr}R4lApaf6f2Am^l)FcEc6Q&uz`(RB7v2#VN*vr4%$z+qYzlln-@k!C;HIW&V^+&p zKuIludE(>jeqL3y;**n;7cN}5@VQlA3@~!+c@Q}Z%qh{Aw0Mk6yC|9TIZ=$mW2L2~ zS@ZMr`j$yu10>PeAP(2p*NgV=-+yCfX66=U`Wb=&dJcR{TExgLmHLPJdc?bT?|#OO zF;`w!SJ&GZw7(G9O)Hy{l9GK33kwr|&Q&V~vrJvi7^vUO{nEzNe1N>)ZUKlQsS4_5 z6XJA@Ij2>?L_leSfvj}|_8O@Kg;S)^5xBLrwUNp^ImE~f#q!V8ii(O3+bOdOsjRHr zi^+e`>6|m$V}n|B1f~J%{$IU3U`OoQR29UIXW_oQ zygXA?RrSAKC;c?}hJ+y|HZ~{JBkl>sJH;C5_oCy{1KqKo!&y zSQL2wyM6oi(;FKb=^|4p0DnhS`JF0L`Iv~+PCK4Xu`50r3WfICIkvN9*?>FTRRng~ zd`{ZgsB%{UGwoQMM-b#*)p)CT4iie2pKyKAk4q<9$AEDTG@xv027sfUlLL=^VXWH$ zUeN69ECY!I`na9ZPRJ3sezP?DiV8Tg;$DK%ri*X0qXgR_6!D*_Q^nYSSO#F%WUz)T zK_^jWJmlNk+YeV%RFq-cpS9bG*NPO+Y0r>CZSw%#}f+S%E8Tzv)W z>+Aa%Z*%kBkp9<}>N|j@kNaXGAXYY3fqJS6w?0RlZ$;sy?v&jq=hT zujWu~V)&g1RGc!_0PmS1@Jjg_hWpVGvD=EF7c48vSXp9LgE3xWtrYEKSh)*a{TQlT z>J%0hKH{Z#w!^iP<5>UO)dQ0qfXH`hTA+xZ(r~3%!Q7}4=ZR3*ud`gn1L>e-oY`(_ zYHHcaj3eM5^?lgsQ6`ZO*p7^2+UaGdeyX8_pTaerrD9eh0h(>>GVb(DV8&3}d=nZS z9qpwos+Qmb$aa;GY5-n%mY#ej7MrNL0h#`T&p0g3%^xEMJ4nMgj=vrp96YP~jLNXu zvDw#o70WA+#WivM{P`cO>}&%TJ2I2GaKj4>fQe8oC h*CDff)}T$i-+zsO>I#!ES}*_r002ovPDHLkV1gL{Ka~Ig literal 0 HcmV?d00001 diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml index b3ecc8754a..dca25c89b9 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml @@ -167,33 +167,35 @@ + android:layout_width="43px" + android:layout_height="43px"/> + android:textSize="18px" /> - diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_surrounding_detail_item.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_surrounding_detail_item.xml index 075ce59f72..3753401c25 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_surrounding_detail_item.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_surrounding_detail_item.xml @@ -1,53 +1,89 @@ - + android:layout_marginTop="@dimen/dp_24" + android:layout_marginRight="@dimen/dp_30" + android:ellipsize="end" + android:maxLines="1" + android:textColor="@color/v2x_FFF_333" + android:textSize="18px" + android:textStyle="bold" + app:layout_constraintEnd_toStartOf="@+id/surrounding_road_like" + app:layout_constraintStart_toStartOf="@id/surrounding_road_type" + app:layout_constraintTop_toTopOf="parent" + tools:text="小黄庄北街与北三环辅路交叉口小黄庄北街与北三环辅路交叉口" /> + android:alpha="0.6" + android:textColor="@color/v2x_FFF_666" + android:textSize="16px" + android:layout_marginStart="@dimen/dp_36" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/surrounding_road_type_address" + tools:text="赵云" /> - \ No newline at end of file + android:textSize="16px" + android:layout_marginStart="@dimen/dp_80" + app:layout_constraintStart_toStartOf="@+id/surrounding_username" + app:layout_constraintTop_toBottomOf="@+id/surrounding_road_type_address" + tools:text="2020-1-12" /> + + + + + + + + +