From 81ca0b946773afa569d4bb07d9775d1634a022d3 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Thu, 19 Nov 2020 15:37:25 +0800 Subject: [PATCH 1/5] opt --- .../main/java/com/zhidao/roadcondition/service/MainService.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt index 205574766b..d7db18d27f 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt @@ -315,7 +315,7 @@ class MainService : Service() { isCustom: Boolean = false, id: Long = 0 ) { - Log.d("MainService", "takeVideo --------1----> fromType = $fromType") + Log.d("MainService", "takeVideo --------1----> fromType = $fromType --isCustom = $isCustom") // if (isAuthorization(BaseApplication.getAppContext())) { CarCorderController.takeVideo(1, duration, isCustom, id, shareType, mainInfoId, fromType, mLongitude, mLatitude, speed) // } From 32ff2cf6b3e617125152131fd420a8f2ae260064 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Fri, 20 Nov 2020 12:28:23 +0800 Subject: [PATCH 2/5] 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" /> + + + + + + + + + From a512b5977d07732d000ae0b36d17ba34b1d7569c Mon Sep 17 00:00:00 2001 From: liujing Date: Fri, 20 Nov 2020 14:09:25 +0800 Subject: [PATCH 3/5] =?UTF-8?q?[add]=20=E7=88=B1=E5=BF=83=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E6=9B=BF=E6=8D=A2-=E5=B7=AE=E7=BA=A2=E6=A1=83?= =?UTF-8?q?=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v2x/adapter/holder/V2XIllegalParkVH.java | 6 ++++++ .../v2x/adapter/holder/V2XRoadEventVH.java | 5 +++++ .../holder/V2XScenarioHistoryIllegalParkVH.java | 5 +++++ .../holder/V2XScenarioHistoryRoadEventVH.java | 4 ++++ .../com/mogo/module/v2x/view/HeartLikeView.java | 3 ++- .../drawable-xhdpi/icon_history_heart_back.png | Bin 0 -> 9769 bytes .../main/res/layout/item_v2x_event_detail.xml | 6 +++--- .../res/layout/item_v2x_scennario_history.xml | 1 + .../src/main/res/layout/view_heart_like.xml | 1 - .../src/main/res/values/style.xml | 5 +++++ 10 files changed, 31 insertions(+), 5 deletions(-) create mode 100644 modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_history_heart_back.png diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XIllegalParkVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XIllegalParkVH.java index b57ff5d648..2bdd6bfabd 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XIllegalParkVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XIllegalParkVH.java @@ -1,10 +1,14 @@ package com.mogo.module.v2x.adapter.holder; +import android.content.res.TypedArray; +import android.graphics.drawable.Drawable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import androidx.core.content.ContextCompat; + import com.mogo.module.common.entity.MarkerExploreWay; import com.mogo.module.common.entity.V2XEventShowEntity; import com.mogo.module.common.entity.V2XHistoryScenarioData; @@ -52,6 +56,8 @@ public class V2XIllegalParkVH extends V2XBaseViewHolder { mAddressTv = itemView.findViewById(R.id.tvAddress); mIllegalNumTv = itemView.findViewById(R.id.tvIllegalNum); mIlIllegalParkingLike = itemView.findViewById(R.id.llIllegalParkingLike); + Drawable drawable = ContextCompat.getDrawable(viewGroup.getContext(), R.drawable.icon_heart_like_bg); + mIlIllegalParkingLike.setBackground(drawable); mIIllegalParkingUnLike = itemView.findViewById(R.id.llIllegalParkingUnLike); // 设置视图状态监听 diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java index 85c7effcc5..ba73a92fc6 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java @@ -1,6 +1,7 @@ package com.mogo.module.v2x.adapter.holder; import android.content.Intent; +import android.graphics.drawable.Drawable; import android.text.TextUtils; import android.util.Log; import android.view.LayoutInflater; @@ -9,6 +10,8 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; +import androidx.core.content.ContextCompat; + import com.mogo.commons.debug.DebugConfig; import com.mogo.module.common.entity.MarkerExploreWay; import com.mogo.module.common.entity.MarkerUserInfo; @@ -133,6 +136,8 @@ public class V2XRoadEventVH extends V2XBaseViewHolder { ivEventLive = itemView.findViewById(R.id.ivEventLive); ivEventCallChart = itemView.findViewById(R.id.ivEventCallChart); ivEventZan = itemView.findViewById(R.id.ivEventZan); + Drawable drawable = ContextCompat.getDrawable(itemView.getContext(), R.drawable.icon_heart_like_bg); + ivEventZan.setBackground(drawable); ivEventReportTrue = itemView.findViewById(R.id.ivEventReportTrue); ivEventReportErr = itemView.findViewById(R.id.ivEventReportErr); } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryIllegalParkVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryIllegalParkVH.java index e32d6aef52..3998c9a69a 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryIllegalParkVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryIllegalParkVH.java @@ -1,11 +1,14 @@ package com.mogo.module.v2x.adapter.holder; +import android.content.res.TypedArray; +import android.graphics.drawable.Drawable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; import androidx.annotation.NonNull; +import androidx.core.content.ContextCompat; import com.mogo.module.common.entity.MarkerExploreWay; import com.mogo.module.common.entity.V2XHistoryScenarioData; @@ -47,6 +50,8 @@ public class V2XScenarioHistoryIllegalParkVH extends V2XBaseViewHolderPyF<4Ht8RCodHeSNTv8z6a^iM+-qBeruk~l z_V@8TYpr*meUh9IKpEFL=Ur<(&+qv?A8WnuyZ1hOpEEU>(5|{_%MZR}<@fyK%9Y>y zxzBv&Q=c4%bgf|3>X}j34F_G<=?90w5I^icc<@gOwhUIUxqehY0~ifq%&#CI*@68# zg&)!rJ%CPM>}f155A-D2U~uhqKLy-iFwFy56$Z^Fc%aP?o@C4;lRhy!`w+t@;VGmD zZ|De|DWcCmLZmyp~-s3ah$;%^;1xa)rwgVk$heh;?W zT;{r?$F~&o)qXSBj9NXFfzGQJdX@*C0;ghb7kWA;Cu2?w`)TZXVBrow<1tsDw~!1H zTo;d{h#e$p#C%AqkWPo02E+{?{J?u?YNqTPWP;pnF-EK=+)4Y_^|0!xBkRncDS3Msj1=iy?eI5p;1G6lD2m3^>3UV z4SrLQ%qvY|Zr$LE4<3Bax6Vg3$4Tx*UfgOe27`9aC82;F5ByS#@xcRs)Z;CaJS&V2 z<8cDavtX-e>gphh~yB+2aQ|DoJlb`a;m5w$==v$ zbj$2GjU5YtCX-eUJqHUKFC|rPV%bDM8p|VeG+1}_t4C)u@}N~2bk*SWBUh$TR-TwT-FYJM;!S3j0p8IwNtcXsd2Qy<_$zE&9tXzTDd+QEB6L?I zy^LLdMn)%+f!fXUoXRCIY)Nh$Omi@)ziz`VxL4R=yIaysoOF(_rAr1E@=7>~=cGEPVa;?u!zs06vjcEMKvF z_wGBNIc*24*Ixe|$fjr@a`nDM`1T|L)pdOk$OjJm@tlC?2>jSqVV5&Kodjbgm50U& z=F85#ZhH6b>rV)agSKo=@?kAZf}H+q4Bkyu!ntS84xR_kJiGt7A6CC>4@4idnA)23~Y z;1Tm>{j3Ifz_siJ_uTV;{;kE1k59|NxKTUj4GZVT1G9tCl`57PgO(lZTBa^F?JdR) zU^sf?g9q>aEy~Wc1^wxp^D#ol+jur^B#fI_xjD+(3&yp~M=cO!vXMwKMc+O7frGnV zfEA(owAyJUv3lM0n@1-``*Nwx%&NA*W1??vYM&PdAQl4AihU7TZl#mcIIu8#`oR8O z7p82!zG0aQ!DGt5gme`(B>+d-RND1qpoI*BoMky_U-TU1B+VsjFibp+;eX{z&Rg=1 zcf8{$V;OHr)swfC4V@n%;3>@r{^LPf{9j5tn}6oK;D30k0vdKH4%x+!O57l1X#5}V=g);rfgB* z&Y7OR^4@!Y{}X9agM~ydqwu9eHJFy5Or+pLE$5+^SB!}-HsL%SDVUy~3=ydM)?UVy zOUSCn!}r%+dil!+k3IVEUy;8g;RGlmfej+`DhsC>tU>@*Rm zLOKA-jmA0gau`33Dc)=^W0|HgX*{k82vF$hO3ow>EG1UpnJu3M;YFx{?(mMLC}m0) zkkdeFF_BeG0hl-D>_X6*rA+44fWCU$1h|MzeAO?e4zC0s0L6zF1-g&$IlBW=$O=S{ zh3PbOnVfQxGh7p-r(^$^*f|^D=$Zstd>s=T4B~T4(#xNm#r6t+;eYtNrHk~U4;d<9 z%`*dQ1E!4rU=iw=m1M}yWKwTzpFaXg22u27C98~$9^)Ae&FtUD!P={~%)&v>Wr;7B z(NPt#98ednSS$V-{2aY_lw+#U%LvD6mwf4hx*DMIBv`um+!yFR@#i1Bn@`AstO9JP zBbDKTj_?D#NC{7NnNsg&Ii07>f#j?b03Xp3+rvY}2x^P5{0|@G6Q+2GF~Ae~70U&r zl3#py0eq5HV#+KhAoarXfL3I^F|ksMpgq^@Poxv~eC4bBd@8wb&z)DvU(l+ z`@0~Qn7Sk&FM}U%MQ^|uLPkBi#K$g@uGYTad-vY?D&odlMU88kIbT~@__moq z%_tGGlj()uc(XnQc+u#NJFxQ7m^>2IWYwvq8#mteYCL4wg+zFJ#doF4fS3>)brGXx1m_*QWjTU;0(krkKir)& zb>9ac*!6dl?9Wv8RVT4#&5i#9@6viJ_X5f4R`P_>JfAeivIz+}G#_8QXvuZ=-FFw0 zJmYpoNzBZ=VcAnpKlwOtqcvYXa4lX%bQJ(mM@Z#rO!61mp;vCpb2RfbPV1eEZU+J9g|iF8wJE5yr_;NZ=_T zE+ERj8I04JQ(>sG`ocGfan9)Z#iZHzyd{`4=YgD(O$}dp@cy0m7R5Y+lO{1UGc)z% zQ-kLsa(DI;W12ez3LKo`gxslwR&yCakcm6kxi2Q9K9*|--c0t>bUR<0H;MJ@e|GWF zWB+=jRD}$zs`iD=6efoykA_YamyrQ6H#BhQoGNint|l#s^XR${;pNNK0!=uShvMV9 zBawiqaLk~xFA6(%LX0YYV!NsO#fB(FE_dSzR7zmbNQEPdwCdUoKZW;XPHyEDz*dcO zV5Gf@K-#4>HEHoh53x1c`v6ypI=*+9fELGi*rW$WRd=Mu1;BbdPYZt83;YR$~wQcnk9EEbk`DNb? z@GggaeDh%1XWvU=?b?|u!18h`=|DeZB6pFbsryVy)$6M?(@K~?)lPgusaL_s@2Eo+ z5m0Y{y12#oY}B)pw-D7~mKX#%mxb{eZd zs5mL~Lu1=B>Ew|g{Muo|rd#|94UN%C5;zautT-rDFqq++BoeWYKvHJC)L|k6IVIFL zz|@;ZT;R7JGiB@E^b8tvOz;SS@X|PyYIab6X9#Uc0^{4O8**m_f(S}igae>MU)>1M zOO(F_r@kbOaW+%nSm_&_edh|uM*hMYW*ax(^2X#+606tU@M@B}1Xh*cRF;H0{&Xx8 zWklQ1i6}X^MXEqSwR~_=r%AxPiuWj7a3>ekv$OGjX1G!kcqw+5Dyyg(x8Yx_qA2Mo zezer#7&1fIhfH}{YT86-#zQ1fZ8Q>>w_C1+duT~bJ*kk$#*II733-$R_FlWKNG~vf zB+kkx3>JWg0uA~j#12+0~3W}1_re#v|>T_+m%;~AM zj}?)wsSm?dW1-}~G3qg?l2PY|fJ0>nrq%dW7ajO=SV7gPLzAP^d_KT%`bpbkm0_;$ z>Mv~=m!*lJ#_`HN0FH{=ZtCR-D^1X6W+BrGnZuP(CJvBLCvHFuu+>Aym7tl8~AtvT8)+uJaw7`468cG6*O&- zLtPL_5ULVS#y9G|4J$!MiHM#;p9B$fnnq6;18g!%4l@{F+G?XwxL}aHjI!AlT1_pZ z`=oE>Vc_^=Ji0{ZL{>)Tux9_C;y$1}VvBQ}No(v|8&dzuu-y_$K7d|N5U}E{%!L9? z6pBfwUdxkCDJLp>8)`McNnZqHU#lJtq+r2WRLgp?$dd7mp5UiqNY@0SX*oDRFv4MC zi!$u!PrC4LeN52VdCw}mQbvI2Jx&19l-jL+k+OTX@&A^ACCd{a{^?qh1(jfW<+5Rmk1`Fwyu z)yhT$%HCrhvsj^Ze3~#izn6IT?%(|P;o?Qh-V}0((R7eRnG&2$)o2}|9CgYfRJ)!H zCRP=IDk)47gsSyNeLELK2d;xwLxbV{_wV>OMq&>37zP zJ+!2zo+OS#?2@O`N-UiZVWWs>98nC1dUhAjBf1Bru+C60%a1%JUl^l1E6)cMPWa(C ze9?=y8vDL)&Rht5$nAZ1>P^8)V#V?oY!;MJ7o!;BOG!nnxAS#(hBNL~%ktgSWK_P}NIgZX(hzisf&ny2^e*bJ$(Wod)kF_NR|SpZ5f#x{B$<>PJ6N)T{x{~x}2IGoy-`<^oS zK(AH6M0>Rb5QJtC(u_xCnJ{$@+FYk|A81#6YWNC0fg{g&o0tSa_;l#2@OzSd4BG{9 z8Vrh6=1NeJeP)?~TEV2w^gh63?ep7TIK8C(%q?BF&8Su~HpZ`+-ZGjUy{QBzJ?M+2 z2W_GOQKo5^eWh>hC{4~nENFf>tlG^T^)2S=CE2|BbuT*p+|hqxAgp}2*B}WbXC?v2 zDw05UT#*US2jn0QZK8Ou>qC3q_b&bUhZZwwoH0z&&5_|_@E=2zAf}l%QUumOp&C!1 z(PHR|+d9rIOABmzs=E?5v-0_fqL^o}pd`q#Wy|X?`0}CSkK@Bp_^eMRV;ZkiJqISO z9COc#YvD8}GgI$w$Ggkk!r4OFf|E${nVDZ$dgRzM_-+4a-J~rmPd;X!rgFA33dcEXP;+g~#q9)ySkKz*jtEl?>TAni< zC+nHopH;gJ8*Y03(W9eR%+8KhA>SXvPP@Fn%D!{7=bY-o6AYQO@(`8yVhi(k;2)kE zb|0FaKKCPfLRb*r*ughsA+~Pay5wJ;IQ-*y7geW|v z?E=U!56!L)O0ApKumT4kVBjGc-_QIPnC`mx;^{p*ckVor6ko5N8Gg;%wbyRB;PBDs zehxRvpF?>s%z78cSrPOMh{fR!R*|J6GOPr!zDPsHx$JaXg?;n|XMh~U84|4Fi{6uq z&vQqk-;ldr->?VDJLuD$(#Z+oKg+P)=tZM zIP{p-9C9&(MGE=K0Bqrf$g_;7>ZG@rh|k-j`xtI$Z#ZyZ=V?ETknhtxIGfW1p9;3> znl0ZsIDY(3yHWRY?#4X#l~@?70Ms$@ntP#E(yd%H-rWQxmjW+148&Z_7SO#!#}hSb%RAW960dq&lSa2IdD8*CCTd5GjG91-QE<}6c>dVqp`4= z6w|XXbw;FKeOAgU+fTa0NS~K7KEkIT`fD5X5R^R;DqEF_!jgUX$#{fl2`Fe{v3}|f zJ_*+Nt2p%IUH}o_r+Mtyzutqp+$(bzkxZp72}NN_aiNW|3n#RSE!TwrvlxrJCW z&#~>T(>Rud?vjk&$|5wJ8NcnEgUnN1~Y*!}gAcT}qBBzK&<|FvyZ&v*j-U7^Edm3f0>P+HP^n1h1@W%ST_!VH zg<)l=GGSa*CCrTb_97;XA-Jjcf{Hxm325z$tPq%lM?L2dW5{}O$N&fH+{Ktu$V`0Qu#+UeWKaI#j}#!v{19~$~7`frlw0sRDBD9B=avk-YkXu)#Z#~Ejx z7o5db?R}D%I0$+RA1*`ovHS0P_m5!QS_PskahYqtXTnF09{)7<<3+hE(^{kqlG~ye zy*YA6l&k=yP4BvE>&6~L;xv|uddU)jt3*3O(|$q#k#w=I*oZG6uA~C?MM*C2>p1`h!kBGrO-BEa~Q>9@-7Pch^|LK`z99CnLu`FAAyYL zXFQJKzWAUb;wb(k%lwooC1~AKOP4JE&i1#~l=kisd@=6Ovxh#7crFZIfYc(=z>esb z3q);ATE(W2Ed%4QypM|JX3jo~CzH@|Y=Rgy@{)W87>gi_f=lI?eP9)0!RF#Qwl;iQ z^S36oOqpZGVJ;wpyMJbff8`%Bb%P6!96k2<)~&ZMNq+X#11A6c`NQu=cd?3%L8g;^ zkt+#@oB?Iw6(|fOFUe*Q=yTVBpDhh5O_X61oYW(EW|H4|AR(|=uX59_^?+CA>?<7!h zLO@3;_lU;^%wY+jCYPR4mxUsi`FxZ-?9)+tWS_t2C!e^8ZDLA!uyJZ!5G@=TP1xb|1G|31n zi?FhgksYNyY#3VM&tVd?N3*Yb=?!5Cy5=G@4oM)S>nC4Mz}jjB{?WP5>%Qfldv^FQ z*Bm}N;;#smO~OjTj@U6U^8h&Y2q29xrJbbg^Hh~2OpCrJL<*6F%yB3<^989p9;LUA zN8M|xb}SAV&`1b(l~*wr_mJ}&{NtCQWNCX5DwZg7xGl!p6aNu(OG>*uGYNl<#jhHYs5R6%yG`Bu`h7`e9FV#v#h((<5jB}wt6};7& z^q3WYF|}70SN;uw*ewX6Kq*zz0W@^aauFm*vt> zXZ##Xk^~`RT+}N*0qi5t#U6T%0q$)P#n)}ZLd;&83X#zd8@f#gK~gSU(c3LdH?PlCW^ zXJ4Kf*WvSY!;$~aUmCN=7t<^}86a(=8q`@|PjT6YrG`2Lfqb$sjH?`phaiKL zr_fX0wseZV#!o;?z%lif8<%&QN+>y|>>Ug7O$%StD}2TsGV>?b@Chsg{&ZT-!I41q zu+BN@1uNv?&_dLJRlp?XFchG*FEVPR4-BUNMV|*K$M%r zCyJE4u$Y?zM=dR9k_1&g5`Y!H9fW&blYynIwP?rbi#-W42`(1hp_4nxg%zK`I&cw1 zZUSm0S19%RMbhZT=VKgJ*Z6ZqS+3FaIrj;^?y4<(bM9rOI6+D`0z#p_IBUFc zC_Q(t9pzadcuPP*V5BpELM>3Sk3j5&1%y79qL^SXMFajfTG_TdN0ytJc5f;nD2ul>}--HI<SD1x)64>549ig9FzevC9K7Q}s z?cYyaTrly!qRv@#9sk>28nbT`{_p1jtZ1pahMu;vI#&G}e7}D9{R%z`uw>EHb*eWG zWg+;-aY2L6E4chgsTn491N-tpeer{Vc0#gJ5lVGD1c7#AoSEq_?Pfs0Df0Qap)}sWuJNclYjHlORr!Sub?v(LkTL4V%r9S=#_v=5y?0* zZBoTliVJ;Huu6zgB$J*>-%BbMCuFu~@-6_y8C&*NQDGnKle-;>3k1r$6qZuT+$%`U zB}kL-=?ciN>{&)wi_@OK#7{f^h76m-oQ0t7@lXH5U#-0KiqFFpULvm{Q&*DEzzE7bmoX+ZPp)F0%)yhpF3;YIBONarHRf?ltDoe@;Y5BU?wu)^ zE5N>=)*tgh1Sjwm;RjCkq2=6OZR};tk12h}3zsa#9sVH+BM5XZSO}GjL@c^n)JT(W z=H~(J!jui#B#+@k&%fx3r6*ei7O63D0p~le->`M_;KVHcq5_(?iJ=@*gdZ+K?BS50 z;|Q4CCF48Nh;fYh#&z~Od+T%rul6*^og00?RqQz1(|NQ; ziT9Pga?hUa_%QmZTf=Z_FcIso{Yn1u@okAFK`BVGMUZWA5CWK1NQ0PIlnm?4I;b=G&qkPkL#pusY)3 zP#-Fu!;ykJfUXco|@#!A33^#TTN?jp#ZuE`~P;+qzQ(IRkd z@smEyF9){wP{uS1Q}J>Z8nv$uDFRDns7LJvagI+=xS z_)%_DM1I0x%!OscJ#fcx_@i%F=*P8e?IY>VO53pEmd&%XC+@;lx?r4eVsT3GiLPN# zoW&~gOuFgw42b2SksAmEi&};dT_W9kfw7DQSIIN9+E-n8;Y$=x4@Se+?%DIs)4B(w z-F!VgoYlsEm+*xzocIlVTILt9@22va%=Fo!Od9nn7626}D;W!v1(7`_<7WZo*<9dS zcFVJn@K5^*#jo}p)ib2^1=AC-fBQuje&4U`*zwb+^^a_l_f-8^Ux?NrPU&vr=38&U z^N{}ydGkNw?Un^*E0+h9ICr`=S-9p>GKO(st*-?x*1Fc`B}!|pMQGCIFk}S>qFhis z3wsiA{_>vP?|e68qDc0$**6iLP1?y^{16N-sIMQ*cE5=1FP>AFC`xNx3epNO_5x7Y z6wRktAWdd_kLjM{@5jk_H^=zscvx3Ip<8hr+p<4MAfFMBQn{t^Ve4CTc?Rvz#@S@_|q47q#pGh+V? zUT1y+?@)Xc?__**G`;AN^Us}nZ0FA3{t|TmDcgSlHOQj0c-n<{00000NkvXXu0mjf DXo2wC literal 0 HcmV?d00001 diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml index bc25522ee9..451abab86d 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml @@ -194,10 +194,10 @@ diff --git a/modules/mogo-module-v2x/src/main/res/layout/view_heart_like.xml b/modules/mogo-module-v2x/src/main/res/layout/view_heart_like.xml index 8080b8a457..9abaf966f6 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/view_heart_like.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/view_heart_like.xml @@ -3,7 +3,6 @@ android:id="@+id/llIllegalParkingLike" android:layout_width="@dimen/module_v2x_event_button_size" android:layout_height="@dimen/module_v2x_event_button_size" - android:background="@drawable/icon_heart_like_bg" android:gravity="center"> @dimen/dp_40 + + + + + \ No newline at end of file From e7061f54dda9a81f2852a9d6a5518f790d483f3f Mon Sep 17 00:00:00 2001 From: liujing Date: Fri, 20 Nov 2020 14:21:12 +0800 Subject: [PATCH 4/5] =?UTF-8?q?1.disttance=20=E9=97=B4=E8=B7=9D=202.?= =?UTF-8?q?=E6=89=93=E7=94=B5=E8=AF=9D=E6=8C=89=E9=92=AE=E5=85=88=E9=9A=90?= =?UTF-8?q?=E8=97=8F,=E9=81=BF=E5=85=8D=E5=87=BA=E7=8E=B0=E9=97=AA?= =?UTF-8?q?=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/res/layout/item_v2x_scennario_history_other_help.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml index 59251e78da..8d055540e7 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml @@ -97,7 +97,7 @@ android:id="@+id/tvFaultHelpDistance" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/dp_33" + android:layout_marginStart="@dimen/dp_33" android:layout_marginTop="@dimen/dp_5" android:layout_marginEnd="@dimen/dp_30" android:textColor="@color/v2x_FFF_333" @@ -113,6 +113,7 @@ android:layout_height="@dimen/module_v2x_event_button_size" android:layout_marginEnd="@dimen/dp_40" android:src="@drawable/selector_call_btn" + android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/ivFaultHelpEventNavi" app:layout_constraintTop_toTopOf="parent" /> From 8783d55a1b605333e5b8edaff59cfbbc1bf0526c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Fri, 20 Nov 2020 15:19:34 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E8=BD=A6=E8=81=8A=E8=81=8A=E6=97=B6=E5=80=99=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=EF=BC=8C=20=20carsChattingProvider.hideUserWindow("MOGO=5FCOMM?= =?UTF-8?q?ON=5FSERVICE",=20mContext,=20null);=20=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E9=92=9F=E8=B6=85=E4=BF=AE=E6=94=B9=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/module/service/MogoServices.java | 100 +++++++++++++++++- 1 file changed, 99 insertions(+), 1 deletion(-) diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java index b93f3bedce..e78d6601cc 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java @@ -13,6 +13,7 @@ import android.os.Message; import android.text.TextUtils; import android.util.Log; import android.view.MotionEvent; +import android.view.View; import androidx.annotation.NonNull; @@ -77,9 +78,12 @@ import com.mogo.utils.logger.Logger; import com.mogo.utils.network.RequestOptions; import com.mogo.utils.network.utils.GsonUtil; import com.zhidao.carchattingprovider.CallChattingProviderConstant; +import com.zhidao.carchattingprovider.ICallProviderResponse; import com.zhidao.carchattingprovider.ICarsChattingProvider; import com.zhidao.smartv2x.common.utils.LoggerUtils; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.json.JSONObject; import java.util.List; @@ -172,6 +176,8 @@ public class MogoServices implements IMogoMapListener, private IMogoNavi mNavi; private IMogoRegisterCenter mRegisterCenter; + private ICallProviderResponse mCallProviderResponse; + /** * 地图视图初始化 */ @@ -397,12 +403,104 @@ public class MogoServices implements IMogoMapListener, */ private void closeAllPanel() { LoggerUtils.log("zy=======stop"); + // TODO @钟超 需要修改下kotlin的校验 + mCallProviderResponse = new ICallProviderResponse(){ + @Override + public void mute(boolean b) { + + } + + @Override + public void matchInvokeResult(boolean b, @NotNull String s) { + + } + + @Override + public void match(@NotNull String s) { + + } + + @Override + public void invokeCallData(@NotNull String s) { + + } + + @Override + public void hangUp(boolean b) { + + } + + @Override + public void error(@NotNull String s) { + + } + + @Override + public void cancelMatch(boolean b) { + + } + + @Override + public void call(@NotNull String s) { + + } + + @Override + public void userWindowStatus(boolean b) { + + } + + @Override + public void userInfoCallBack(@Nullable String s, @Nullable String s1) { + + } + + @Override + public void isOnLine(boolean b, @Nullable String s) { + + } + + @Override + public void isFriend(boolean b) { + + } + + @Override + public void invisibleUser(boolean b) { + + } + + @Override + public void hideUserWindowError(@NotNull String s) { + + } + + @Override + public void canCall(boolean b) { + + } + + @Override + public void callInvokeError(@NotNull String s) { + + } + + @Override + public void addFriend(boolean b) { + + } + + @Override + public void callWindowStatus( boolean b ) { + + } + }; MogoApisHandler.getInstance().getApis().getShareManager().dismissShareDialog(); MogoApisHandler.getInstance().getApis().getOnlineCarPanelApi().hidePanel(); MogoApisHandler.getInstance().getApis().getAdasControllerApi().setSettingStatus(false); MogoApisHandler.getInstance().getApis().getEventPanelManager().hidePanel(); carsChattingProvider = (ICarsChattingProvider) ARouter.getInstance().build(CallChattingProviderConstant.CAR_CALL_PROVIDER).navigation(); - carsChattingProvider.hideUserWindow("MOGO_COMMON_SERVICE", mContext, null); + carsChattingProvider.hideUserWindow("MOGO_COMMON_SERVICE", mContext, mCallProviderResponse); } public void init(Context context) {