From 8752c301ec72dd2947ee1e4391f664ce89ff7fdd Mon Sep 17 00:00:00 2001 From: liujing Date: Tue, 10 Nov 2020 19:22:52 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=B1=82=E5=8A=A9UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/values/colors.xml | 1 + .../res/layout/module_ext_layout_entrance.xml | 8 ++++---- .../res/values-xhdpi-1920x1000/dimens.xml | 1 + .../src/main/res/values-xhdpi/dimens.xml | 1 + .../src/main/res/values/dimens.xml | 2 ++ .../scene/help/V2XSeekHelpButton.java | 2 +- .../main/res/drawable/bg_v2x_cancel_help.xml | 15 +++++++++++++++ .../layout/module_v2x_event_share_item.xml | 4 ++-- .../icon_heart_second_light.png | Bin 2184 -> 1687 bytes .../icon_heart_unchoose_light.png | Bin 2039 -> 1115 bytes .../drawable/icon_heart_second_light.png | Bin 822 -> 701 bytes .../drawable/icon_heart_unchoose_light.png | Bin 771 -> 486 bytes .../main/module-common-res/values/colors.xml | 4 ++++ .../drawable/bg_v2x_cancel_help_light.xml | 15 +++++++++++++++ .../bg_v2x_event_description_light.xml | 4 ++-- 15 files changed, 48 insertions(+), 9 deletions(-) create mode 100644 modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_cancel_help.xml create mode 100644 skin/mogo-skin-light/src/main/module-common-res/values/colors.xml create mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_cancel_help_light.xml diff --git a/modules/mogo-module-common/src/main/res/values/colors.xml b/modules/mogo-module-common/src/main/res/values/colors.xml index d73639033d..0856fc721d 100644 --- a/modules/mogo-module-common/src/main/res/values/colors.xml +++ b/modules/mogo-module-common/src/main/res/values/colors.xml @@ -3,4 +3,5 @@ #7f000000 #FFFFFF #FFFFFF + #FFFFFF \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml index 97b5c3903e..434ab6b7c4 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml +++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml @@ -146,8 +146,8 @@ android:background="@drawable/module_ext_dw_common_corner_bkg" android:gravity="center" android:text="前方\n实况" - android:textColor="#FFFFFF" - android:textSize="@dimen/module_ext_navi_exit_textSize" + android:textColor="@color/module_commons_FFF_333" + android:textSize="@dimen/v2x_cancel_help_text_size" android:textStyle="bold" android:visibility="gone" tools:visibility="visible" /> @@ -160,8 +160,8 @@ android:background="@drawable/module_ext_dw_common_corner_bkg" android:gravity="center" android:text="取消\n求助" - android:textColor="#FFFFFF" - android:textSize="@dimen/module_ext_navi_exit_textSize" + android:textColor="@color/module_commons_FFF_333" + android:textSize="@dimen/v2x_cancel_help_text_size" android:textStyle="bold" android:visibility="gone" tools:visibility="visible" /> diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml index 75f2f2b1fa..25cd518534 100644 --- a/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml @@ -52,6 +52,7 @@ 32px 60px 32px + 30px 20px diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml index 1fa92b0372..7e1bb606da 100644 --- a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml @@ -52,6 +52,7 @@ 32px 60px 32px + 30px 20px diff --git a/modules/mogo-module-extensions/src/main/res/values/dimens.xml b/modules/mogo-module-extensions/src/main/res/values/dimens.xml index fbcc5e2099..99476d878e 100644 --- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml @@ -53,6 +53,7 @@ 20px 30px 16px + 14px 8px @@ -171,4 +172,5 @@ 10px 22px 16px + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpButton.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpButton.java index c032668c54..00a06744ca 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpButton.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpButton.java @@ -54,7 +54,7 @@ public class V2XSeekHelpButton implements IV2XButton { tv = V2XServiceManager.getMogoEntranceButtonController().getButton(ButtonIndex.BUTTON2); tv.setText("取消\n求助"); tv.setVisibility(View.VISIBLE); - tv.setBackgroundResource(R.drawable.bg_v2x_event_live_show); + tv.setBackgroundResource(R.drawable.bg_v2x_cancel_help); tv.setOnClickListener(v -> { //调用取消求助接口 // TODO: 2020/5/18 回调，显示对话框 diff --git a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_cancel_help.xml b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_cancel_help.xml new file mode 100644 index 0000000000..8882692332 --- /dev/null +++ b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_cancel_help.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml index 044f98c29d..6bf0a69a87 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml @@ -33,7 +33,7 @@ android:layout_alignTop="@+id/road_case_style" android:paddingRight="@dimen/dp_28" android:text="100" - android:textColor="#FFFFFF" + android:textColor="@color/v2x_FFF_333" android:textSize="@dimen/dp_26" /> E5tj{+Fn?Wmk@4 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 diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/icon_heart_unchoose_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/icon_heart_unchoose_light.png index 09ab4af9e358c0e0388249c2207cab6a1727ea6e..003cf9aa07acfd65ac46e304124e9beb1910885f 100644 GIT binary patch delta 1082 zcmV-A1jYOJ58DWkFn20i-=If{sGB895j$jnke)^6clu& zK^ZhEoD|}qK{asLOos&$6pbPpL|HbeXs&rnB&f_wI>~}mu4%Wt{eHXsoco^TK9?&& z3!d}5>-~7vyVqWO?=v&QSXx?ov*&&C2*)A#0{9L5Dz6!hMt?70{0`2`%s+tt9aQX& zt=>9ts}A^H_1?f<)?%VgMVI>*@g`O{s zFuH;C%NSAXlDUQt`|u=@ylc|a&r|`gC5XKfxHDbT@4{K4<%Kl_uYk)vo1h)OVnQ3t zT)u3=OMQh(QGZiGobE1{hD_WGvJVD-PU1NP zJR=+XoO)+|ApW`MTx}o7FTrPYXP4uFhHuB6U>i`Qt&NU*?6EqQ?dcjp;3=Gb zn^P#qZkwrdKlpD0hsW$jFs*h-Pv3Exne&z84*1gZ>e6wFrt!4A+GMrWiB|Q;KJHdN z41YXHamv+>K+DOAKl8SJ$Zw5DUKX2dM7SGOuohQ;>~Nbm&0q6|?2!lbtI~)K33sUF z*4M^UYcsLs%)`;CIX|uCpuER9@#E-!q;#7r3&$^4+jz~Xu^~ITa&FBTdN^4h--if3 z+AmZ^YO(%6e;dmJUTw{rX8X7D6uFacw156Rup9s80ii6aXzXzH#ZD|-{lB2$J49bM z#yb*+OhdkmX2G2xLg5I?)m}~fEH!hr0p{HpY$QP%@-ROJYD0DLY7aFM-_K~+z{FQ7 z>&PoMl0+IZ?*ZU{_K2s6%;ngL&Exxar3Q$1V^xhLxo_xx=I)S-Wx>`yMeM|C8Z#iT z8`srHie#GdarZl4oAHnKN#p*KWm{h?UK}03jhEB07*qoM6N<$f>whW AnE(I) delta 2013 zcmV<32O{{}2=@<=Fnt8OG=9I!#)#Nf#srB%pv;RDb|cQUNV2 zKvb3*65P-wPRm@rimL8FW4YOLhN9HsE7nzRl-SWQ__YIHFc6U z*Y}(me$R~0wN2Bg2#KS6?|i-U&htL+$DC^n&$03OBWkCo7k~Gtwd3P+zp&oja>n1V z)~~c$cExJtc>Cm&E`=K*`1hWE`ib9bE*gn2lH$PJ|i~Afqjd3ixjzjb4=-?ll z^-b;U?AeDmO*Dgvsrh}AlMDNsal5_v;4Hv37H==08gRlQ(5@3g2A_`%#+h!ib`^_+ zW7P(`8rk4t>LzbiolOjq?Sg*QxkO)p*~Fr$n8$W|ynp@DL8%W|0Vi3t%nhOM9mhnv z`p(}MTh6a0hc;U00$S{q!-w}==Miq^qGwlS;P3` z+@4sQ2RuGW$<)TA+Im}=7_L75{Lrr#7ZY9S!@+2kQyC~Pex*3fsR_RdvI z)&pz8n_&FfloE>_mw{%eob zrKKf*?OKQUfDi1|w+A_eyg_4+q6ose6Rth`?0>$$iQt|R4fGTjof*hx*_hE31P(KR zZvB;!k-Zm-bou>|l8uY_`}=IlineYIZyh+W_l=F~O~0pPe0=^}&Y7=3Zg9^1`MKu~ zz0wG&J$LThmP?mbzK6%|HKw|9`}U6WM~?iM$j2PPA3whE0&Xszk(ZpSp}F>c+u5

o893DBf9bJI3Q+xgN3`;v1f} zZ})!)(U6kP)+VM%hSW4M$Apcf9|6ZYa8azFYhs1?=0GWW_g(X)fIu|f);21LiV)k1 zP((G+n;ffbU|&pLrec)yQW8Tj_o?#LmVZcvohZ$M%Z`}mQS6Bg&0CkUV#P^=LT!vx zPHoDQIbRGm5Q&0LNE1aUZqU)95Gx@()ZJ9YK9Jvk|CVJJ!hNT3QdGj}L@DSgCVxbe zAzO8*S0152a-6PyH83#nzLN`qzKr?USvIN73ApBVd8RR;u2G5tx%lA0z31t#hkyO# zgUytk*|LrOF;GjrnWDTSSM*Me(ZffREG{;5GAc|E<{DZ}!sYa)cOv!E&ULuTAb z!AC05!u0f+FJkg8y15X2)i*T?h9-o6$A1R5lIv}`o`F$Nc2_2 z?DE*ylgkai8OX6?Gv9H}?$$vl$eYlvyo{D0By`9nB?SFk&!tqr95pHZu74o0kFb?g zYyhK+ix$_Cqc-B{s4SY9_@8WKpePr( z1Wgngz)9A#Ssy8HSSSZ+jC(U1GP1C`(O|LUFY-F!zoz19fNH2Ph$iPLEaC##nv*ge zL>5XHR)x%*0aC7n$cU@8f`5c86cRv|mpAwNv zAseZDu#)RruJ*-h=oc)RLk(tq4X_PJ){HsRQa;ruyE91M24a9!DjRM9a$#H7L1sld zyn#Ir!q|cjA6`{$mT%Rnpb0pLASaCz*y&#&d{nyyo{tFq1qJDb%<*)L-{0$wtG4eMC zsIo}wqy~3i0YN_X0)J4T#G~5s9SxVqYXYi#V`+d97oM1xWXK6tbn z(=KI$>WAUF)bR>fUBxBpl^F^;t$5bf`uHXT$N^bE_W&u5GJ_f1^~;xETRwX9sN9yH zO+cDS&UgGfd6>BB&j+u$AzRe+QJk5<`W6-z%NuKLT%~ZeY=4Vj%@<|{7+e0@=upBf`OUZtnCqVYeR&h?{jc2vlKb-SWZ^9OXN*xJUq7tu0p%9eVuYod7gv z-4#e9BtTq;yb0dZFE=O-TGRvupQzWkxBy04j&voHafA1*e-01-Z+sj8jqd*nNV7@pi4$i&UsbkWMX*WF vR%`1&hK2^-+$i^d>+8=Of2u$IzaIE+C^4S=O6!u?00000NkvXXu0mjfZDRKK diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable/icon_heart_second_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable/icon_heart_second_light.png index e26dbe8a7bf4deb95504989940b92596bda2c7a1..e805f56811717226301b0bd842bbe3504b376705 100644 GIT binary patch delta 664 zcmV;J0%!fU2E7H4F@JYSL_t(I5tUO*Yg0iKK4U0RCxAfz<~(NzrEibAQC;w!aDo5#()<9Fs}Vu}lK;LAC4 z<~!evi$Fs0Jwy=>8(rwvL1b`fKvb|eiV2<0u>Yt6V{QS| zh(c-_5wX{Flu*+f)t@ii4I-KnVl%WPN2r4^Em`*SAAg!FTnh|66k=PcLy*9>RrJ&M z(apteL2NLmkyQD!c?HP9XQb>^m2 ybvVCp8F6Vv{x>DZ`7c{MId~86=E%R2egi!xAQ4(7vb#k90000Y5ltrV%)bUy+AuVZ`X|5BG%^S)Q_Q0 z&rxbprLCIJ_wNs1xNvz7F)wG5YrA)Ey~)|74QdE_q$Ip^P18fj3s^YMECsgS9qY$& z(v^vsVw{Tb2tELC9-WOCqPaGV6^9C-V1=*7WCiYmC4aBVg^1(V5~?1?BtMQQfTO_Y z0KnuNSaZ8}Y!1Cst1VPIDp77%&k?wH^u_^v?w+FMPGt)p1AH{2b01k#4Ml1nzff!Zib@hn6Q~h z%CLug+<%A+R*Sy8r5DQyrnUM z5?M*zC^nf*mZ1Xe`e@i!qX`*Q7FpD=XdVj*^Kofag+1T%-l2cX6}72my0V+(|lew z#tL+oU~FStw8;Y%MRqW%pbQ?t186KZm%xBLDd*r%a13S&JbxyEH@(~V;-IYwTNf<-T5`u?F1?%(Mx1Y2%HcMi_)tYb>PLNBuOqC3im|32>M+p^wdsZ z9q6#O$gCpLXhYx(zo_B&aC{HGarIc#{I3z}NBD>=TYJ4GvOsHs;1_{+!0~HM)k7-~j%;s5lB{TX%E>I;Tz04RmLkPAur_*##-k z9d`iJnC_m~p$cta^hAM)ve?JWZWhzvx-kvzH{bB}l^Sc$V9Cacf2pG`j5Rq?>;-23 z#d_JPKkaD(V;RNtMs=6f(G9l}zS?FXgkjO)1jYzZqB(WqZN;uBP=cH5S0US>pt{qq qZN~)9FQ(ui`0;OL75D~390Qx%j7wzz0000^YA-24=OIi12;2g zGV|S;Z@x>^JB>y|so+d!auHE&JU@}#1|}>{t+sNp zR$Dz6e4Yaa%qj1EBBDFYvdzrK3nhXW?j4Q5kY{QuiaOp?f*Cr_Ns?0n8wyp216(+j z%E}c%bwCW&4uAe|q?^U!)n+$i$8Wv9c0P{RM|XsXXJ(%1k&zGMXkUhhd973`{hFV@ ze}c6xxYWI!p1$!e5O)WScSJZL;SPJh%{nrnX;6ki?0fB55*ALGIPpZONMyZ*)q?&g z)q2-n^hzl+p^DSs6FDTR?p<_9{31%}=ZX{(C5($dLw};hBO#WS%a=c96jUn9C%u;g zBHi)5qKt-{rE9Oklmng?79JdpBE3Hl7)YI*9DlKshJhc)PY%WLjh_PNNs}KVrh5@G08R(SM2^-D;I0F>Nj>QF4Sx|rifOu?zY*uWE9RzDq zfGU^sk|eT@H+IBhd7vD?X_x-6U7dO+Ill!8~Qno<_@cD zjL?2~a|Ax{MvP(5EdX&39b$AO + + #333333 + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_cancel_help_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_cancel_help_light.xml new file mode 100644 index 0000000000..418d03a9bb --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_cancel_help_light.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_description_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_description_light.xml index 48d0b7deb6..79c69fb8a2 100644 --- a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_description_light.xml +++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_description_light.xml @@ -4,8 +4,8 @@ From 468d8b7000d6dddc5833bea67c994eb47f925be4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Fri, 13 Nov 2020 10:51:30 +0800 Subject: [PATCH 02/17] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=9B=A0?= =?UTF-8?q?=E4=B8=BA=E7=94=A8=E6=88=B7=E6=B2=A1=E6=9C=89=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=AF=BC=E8=87=B4ugc=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=BF=87=E5=A4=9A=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/v2x/adapter/holder/V2XEventUgcVH.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java index 00050ea54b..6962c8e1e9 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java @@ -14,7 +14,6 @@ import com.mogo.module.common.entity.V2XEventShowEntity; import com.mogo.module.common.entity.V2XRoadEventEntity; import com.mogo.module.v2x.R; import com.mogo.module.v2x.V2XServiceManager; -import com.mogo.module.v2x.alarm.V2XEarlyWarningServer; import com.mogo.module.v2x.scenario.scene.ugc.V2XEventUgcScenario; import com.mogo.module.v2x.utils.EventTypeUtils; import com.mogo.module.v2x.utils.V2XUtils; @@ -54,6 +53,10 @@ public class V2XEventUgcVH extends V2XBaseViewHolder { private V2XEventShowEntity mV2XEventShowEntity; + // 判断用户是否点击了，如果没有点击的话就自动设置为无效 + private boolean isFeedbackClick; + + public V2XEventUgcVH(ViewGroup viewGroup) { super(LayoutInflater.from(viewGroup.getContext()) .inflate(R.layout.item_v2x_event_ugc, viewGroup, false)); @@ -85,6 +88,11 @@ public class V2XEventUgcVH extends V2XBaseViewHolder { .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GONG_YES_UN_WAKEUP) .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GONG_NO_UN_WAKEUP); + + // 如果用户没有点击则自动设置为无效 + if (!isFeedbackClick) { + manualMarkingTrafficJam(0); + } } }); } @@ -93,7 +101,7 @@ public class V2XEventUgcVH extends V2XBaseViewHolder { public void initView(V2XEventShowEntity v2XEventShowEntity) { try { Log.w(MODULE_NAME + "_" + TAG, "v2XEventShowEntity=" + GsonUtil.jsonFromObject(v2XEventShowEntity)); - + isFeedbackClick = false; if (v2XEventShowEntity == null) { return; } @@ -127,12 +135,14 @@ public class V2XEventUgcVH extends V2XBaseViewHolder { ivEventReportTrue.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { + isFeedbackClick = true; manualMarkingTrafficJam(1); } }); ivEventReportErr.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { + isFeedbackClick = true; manualMarkingTrafficJam(0); } }); From ffcb1c9296b524c2d917792c12d2ce2175a9860f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Fri, 13 Nov 2020 12:07:34 +0800 Subject: [PATCH 03/17] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=BB=9F=E8=AE=A1=20http://wiki.zhidaohulian.com/page?= =?UTF-8?q?s/viewpage.action=3FpageId=3D42321443?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/gradle.xml | 1 + .idea/misc.xml | 2 +- .../java/com/mogo/module/v2x/V2XConst.java | 2 ++ .../v2x/adapter/holder/V2XEventUgcVH.java | 18 ++++++++++++++++++ .../scenario/scene/ugc/V2XEventUgcWindow.java | 2 +- 5 files changed, 23 insertions(+), 2 deletions(-) diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 8e9756d758..b59a552525 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -77,6 +77,7 @@ diff --git a/.idea/misc.xml b/.idea/misc.xml index e082ea7475..a2da5c6cd8 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XConst.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XConst.java index 8818ec3b1c..f385c2e48f 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XConst.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XConst.java @@ -62,6 +62,8 @@ public class V2XConst { public static final String V2X_ROAD_EVET = "v2x_road_event"; public static final String V2X_ROAD_EVET_HISTORY_BUTTON = "V2X_button_click"; public static final String V2X_ROAD_PRODUCE = "v2x_road_produce"; + public static final String V2X_ASK_ALERT = "v2x_ask_alert";//UGC 提问 + public static final String V2X_ASK_RESULT = "v2x_ask_result";//UGC 提问回答或消失 public static final String LAUNCHER_ICON_CLICK = "Launcher_Icon_Click"; /** * V2X 道路事件操作类型 diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java index 6962c8e1e9..0911accdeb 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java @@ -13,6 +13,7 @@ import com.mogo.module.common.entity.MarkerExploreWay; import com.mogo.module.common.entity.V2XEventShowEntity; import com.mogo.module.common.entity.V2XRoadEventEntity; import com.mogo.module.v2x.R; +import com.mogo.module.v2x.V2XConst; import com.mogo.module.v2x.V2XServiceManager; import com.mogo.module.v2x.scenario.scene.ugc.V2XEventUgcScenario; import com.mogo.module.v2x.utils.EventTypeUtils; @@ -22,6 +23,9 @@ import com.mogo.module.v2x.voice.V2XVoiceConstants; import com.mogo.module.v2x.voice.V2XVoiceManager; import com.mogo.utils.network.utils.GsonUtil; +import java.util.HashMap; +import java.util.Map; + import static com.mogo.module.v2x.V2XConst.MODULE_NAME; /** @@ -129,6 +133,11 @@ public class V2XEventUgcVH extends V2XBaseViewHolder { } }); ivEventTypeIcon.setImageResource((Integer) ugcTitleStr[2]); + + // UGC 问答数据统计 + Map properties = new HashMap<>(); + properties.put("content", (String) ugcTitleStr[1]); + V2XServiceManager.getMogoAnalytics().track(V2XConst.V2X_ASK_ALERT, properties); } @@ -137,6 +146,7 @@ public class V2XEventUgcVH extends V2XBaseViewHolder { public void onClick(View v) { isFeedbackClick = true; manualMarkingTrafficJam(1); + dataStatistics(1); } }); ivEventReportErr.setOnClickListener(new View.OnClickListener() { @@ -144,6 +154,7 @@ public class V2XEventUgcVH extends V2XBaseViewHolder { public void onClick(View v) { isFeedbackClick = true; manualMarkingTrafficJam(0); + dataStatistics(2); } }); } @@ -153,6 +164,13 @@ public class V2XEventUgcVH extends V2XBaseViewHolder { } } + // UGC 提问回答或消失 + private void dataStatistics(int result) { + Map properties = new HashMap<>(); + properties.put("result", result); + V2XServiceManager.getMogoAnalytics().track(V2XConst.V2X_ASK_RESULT, properties); + } + /** * 对道路事件进行反馈 */ diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/ugc/V2XEventUgcWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/ugc/V2XEventUgcWindow.java index 8e1c82f927..ef8b05eeeb 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/ugc/V2XEventUgcWindow.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/ugc/V2XEventUgcWindow.java @@ -70,7 +70,7 @@ public class V2XEventUgcWindow extends RelativeLayout } public void initView(Context context) { - Logger.w(MODULE_NAME, "V2X-初始化疲劳驾驶"); + Logger.w(MODULE_NAME, "V2X-初始化UGC的Window"); LayoutInflater.from(context).inflate(R.layout.window_fault_help, this); // 详情列表 mRecyclerView = findViewById(R.id.rvRoadEventList); From 6f3b4e6df336bb75b021d73476f13a5dea5bcb65 Mon Sep 17 00:00:00 2001 From: liujing Date: Fri, 13 Nov 2020 18:13:04 +0800 Subject: [PATCH 04/17] =?UTF-8?q?[rm]=20=E5=88=A0=E9=99=A4=E6=97=A0?= =?UTF-8?q?=E7=94=A8=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/drawable/bg_v2x_cancel_help.xml | 15 --------------- .../drawable/bg_v2x_cancel_help_light.xml | 15 --------------- 2 files changed, 30 deletions(-) delete mode 100644 modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_cancel_help.xml delete mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_cancel_help_light.xml diff --git a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_cancel_help.xml b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_cancel_help.xml deleted file mode 100644 index 8882692332..0000000000 --- a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_cancel_help.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_cancel_help_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_cancel_help_light.xml deleted file mode 100644 index 418d03a9bb..0000000000 --- a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_cancel_help_light.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file From 5238a03b43297ce88cc2dee314b9fe7d205abcd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Fri, 13 Nov 2020 18:15:36 +0800 Subject: [PATCH 05/17] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=86=E5=85=B3?= =?UTF-8?q?=E9=97=AD=E5=AF=B9=E8=AF=9D=E6=A1=86=E4=B8=BB=E5=8A=A8=E8=B0=83?= =?UTF-8?q?=E7=94=A8=E7=9A=84=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/v2x/adapter/holder/V2XEventUgcVH.java | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java index 0911accdeb..7451f280ac 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java @@ -56,11 +56,6 @@ public class V2XEventUgcVH extends V2XBaseViewHolder { private V2XRoadEventEntity mV2XRoadEventEntity; private V2XEventShowEntity mV2XEventShowEntity; - - // 判断用户是否点击了，如果没有点击的话就自动设置为无效 - private boolean isFeedbackClick; - - public V2XEventUgcVH(ViewGroup viewGroup) { super(LayoutInflater.from(viewGroup.getContext()) .inflate(R.layout.item_v2x_event_ugc, viewGroup, false)); @@ -92,11 +87,6 @@ public class V2XEventUgcVH extends V2XBaseViewHolder { .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GONG_YES_UN_WAKEUP) .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GONG_NO_UN_WAKEUP); - - // 如果用户没有点击则自动设置为无效 - if (!isFeedbackClick) { - manualMarkingTrafficJam(0); - } } }); } @@ -105,7 +95,6 @@ public class V2XEventUgcVH extends V2XBaseViewHolder { public void initView(V2XEventShowEntity v2XEventShowEntity) { try { Log.w(MODULE_NAME + "_" + TAG, "v2XEventShowEntity=" + GsonUtil.jsonFromObject(v2XEventShowEntity)); - isFeedbackClick = false; if (v2XEventShowEntity == null) { return; } @@ -144,7 +133,6 @@ public class V2XEventUgcVH extends V2XBaseViewHolder { ivEventReportTrue.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - isFeedbackClick = true; manualMarkingTrafficJam(1); dataStatistics(1); } @@ -152,7 +140,6 @@ public class V2XEventUgcVH extends V2XBaseViewHolder { ivEventReportErr.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - isFeedbackClick = true; manualMarkingTrafficJam(0); dataStatistics(2); } From e40677316292a0a21dd24fad0048c9f675dd8e6e Mon Sep 17 00:00:00 2001 From: liujing Date: Fri, 13 Nov 2020 18:17:42 +0800 Subject: [PATCH 06/17] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drawable-xhdpi/icon_heart_choose_light.png | Bin 1722 -> 0 bytes .../drawable/icon_heart_choose_light.png | Bin 677 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/icon_heart_choose_light.png delete mode 100644 skin/mogo-skin-light/src/main/module-common-res/drawable/icon_heart_choose_light.png diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/icon_heart_choose_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/icon_heart_choose_light.png deleted file mode 100644 index 2c7b60f98d451e52d4628434289e1bc305f1160f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1722 zcmV;r21WUaP)Px*bV)=(R9FeUS8Iq>RTSR)%pIMvG(-%w3`DYG?(Ol*M(57VojWhVKQfp~gh60J zBm@~oP-BH4`NOCm6(mT6)>!zXFlUmkGvi}~K*;jdgM8HZh$NlooqKlQx7OL`-m4-? z(4IMGuf6tK-}?4i>zp%V48}-nW|;Gzne)eEa zA&n!0BUpV;Nk98&I@k-94?b&aJS~K5!-G%1*&hw3RXSlYbZB35x89QI(5U&Hj z=}%F*rY=EZ1wa+#L`t?0k*0AlttS`o1bG}+y>Zm&_@Qy12i96Qvp%SVPBsddi4Z#b zS*riYiukG_`u7V3YLhP_&6moJ}m;jh6l z@2u2$EHctw_CQ=i-i^#J!>RNUqu__@>PgxW4`EII2~lS+|`}iSZerBHala;B(qnP0`+luH4t0TDI^mdmZoMD%*$sIfzRPEjSGa9K&X_x0h zbpZDOGDl!gruq+0Mobg%Hsjm7B^Q zic&D+PvuCUn9Df;1zBE4kI=XjV zXu`Yc$3k$RjkFhaJq(P^4>YvAZ96+zH_dCIz3B~n(M01Lm$Q-QQ9W5GN^(WAHNh1V z*rfyl`LFTixu)*ex96jVvU zh;~sPrv_MT^DH^b1rIMX-Ap?{K@fK&JK}c9gIcR%#eis00U;kDYX?`(MIKRW@qZ)z$$r>OzqCC zLcmw`%S3~SF)*0AVs@xU7zCD2K@>>*V5k1{@&3$I(O>nXNq_8EyMZLIB-i3__$%r1 z-xt4dVYt-So`E@dr$}H~W4iw2Vgs#~MD5hS*kkm!Hux%-J-4H#t7}}qa4RF?m2S7JQzt%RyDK%Rde!wG3C6uC5pHlGLlu8q z9^8&JKCJ;6NFQ5zUVn0uAS9bxXJ~|k{WLje?rPiB#s4dAI&MkCd+_!Dd#>jrobEa4 z5!paM&??W466Lm(#M+OO&FyRaYuw}AY`!fb-Vs6VuMKtYAww@v#|-!$Qc_S5(c1TG zdJnC;ldt3*5kZJ}oT#sT2gF{MlKDQcW=pDXV0~=#e+oaPYu`ME>%YeQ7b-3GlV){N Qw*UYD07*qoM6N<$f~vVf&Hw-a diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable/icon_heart_choose_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable/icon_heart_choose_light.png deleted file mode 100644 index a2d1364f83606991b6d59b78e77c956256fa5a04..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 677 zcmV;W0$TlvP)Px%Ur9tkR5%fpQqOBsK@gsOMubRPyosRT-Si|TEw7155nFooKk(wsY7x`^WI znS!)8GUaT-2=NLezL%iDs|wVNNBTQqM_nGJjW?n-)`t-!8smscnVOYY7_`* zAwc>hzR*3fM#bWn3M4tkP?FL9DID+; Date: Fri, 13 Nov 2020 18:32:51 +0800 Subject: [PATCH 07/17] =?UTF-8?q?=E5=B0=86=E4=B8=8A=E4=BC=A0=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E7=94=A8=E6=88=B7=E7=82=B9=E5=87=BB=E5=90=8E=E5=86=8D?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E4=B8=8A=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/v2x/adapter/holder/V2XEventUgcVH.java | 14 ++++++++++++++ .../module/v2x/alarm/V2XEarlyWarningServer.java | 12 ------------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java index 7451f280ac..a9e376acef 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java @@ -9,6 +9,7 @@ import android.widget.TextView; import com.mogo.commons.voice.AIAssist; import com.mogo.commons.voice.IMogoVoiceCmdCallBack; +import com.mogo.map.MogoLatLng; import com.mogo.module.common.entity.MarkerExploreWay; import com.mogo.module.common.entity.V2XEventShowEntity; import com.mogo.module.common.entity.V2XRoadEventEntity; @@ -21,6 +22,8 @@ import com.mogo.module.v2x.utils.V2XUtils; import com.mogo.module.v2x.voice.V2XVoiceCallbackListener; import com.mogo.module.v2x.voice.V2XVoiceConstants; import com.mogo.module.v2x.voice.V2XVoiceManager; +import com.mogo.service.share.IMogoTanluProvider; +import com.mogo.service.share.TanluUploadParams; import com.mogo.utils.network.utils.GsonUtil; import java.util.HashMap; @@ -133,6 +136,17 @@ public class V2XEventUgcVH extends V2XBaseViewHolder { ivEventReportTrue.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { + // 上报事故 + TanluUploadParams params = + new TanluUploadParams( + mV2XRoadEventEntity.getPoiType(), + IMogoTanluProvider.UPLOAD_FROM_STRATEGY_UGC, + mV2XRoadEventEntity.getNoveltyInfo().getInfoIdInt(), + new MogoLatLng(mV2XRoadEventEntity.getLocation().getLat(), + mV2XRoadEventEntity.getLocation().getLon()) + ); + V2XServiceManager.getTanluManager().uploadRoadCondition(params); + manualMarkingTrafficJam(1); dataStatistics(1); } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XEarlyWarningServer.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XEarlyWarningServer.java index 157793b9e3..80c91f14f8 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XEarlyWarningServer.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XEarlyWarningServer.java @@ -82,18 +82,6 @@ public class V2XEarlyWarningServer { intent.putExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY, v2xMessageEntity); LocalBroadcastManager.getInstance(V2XUtils.getApp()).sendBroadcast(intent); - - // 上报事故 - TanluUploadParams params = - new TanluUploadParams( - v2XRoadEventEntity.getPoiType(), - IMogoTanluProvider.UPLOAD_FROM_STRATEGY_UGC, - v2XRoadEventEntity.getNoveltyInfo().getInfoIdInt(), - new MogoLatLng(v2XRoadEventEntity.getLocation().getLat(), - v2XRoadEventEntity.getLocation().getLon()) - ); - V2XServiceManager.getTanluManager().uploadRoadCondition(params); - } // 移出已经预警的事件列表 //V2XAlarmServer.mAlertRoadEventList.remove(v2XRoadEventEntity); From af9d6515e5d0069dd434cb85c609405d132d4069 Mon Sep 17 00:00:00 2001 From: liujing Date: Sun, 15 Nov 2020 15:01:18 +0800 Subject: [PATCH 08/17] =?UTF-8?q?[add]=20TTS=E6=92=AD=E6=8A=A5=E6=88=91?= =?UTF-8?q?=E7=9A=84=E5=88=86=E4=BA=AB-=E6=AF=8F=E5=A4=A9=E9=A6=96?= =?UTF-8?q?=E6=AC=A1=E5=BC=80=E5=90=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v2x/fragment/V2XEventPanelFragment.kt | 3 ++- .../v2x/fragment/V2XShareEventsFragment.java | 20 +++++++++++++----- .../com/mogo/module/v2x/utils/V2XUtils.java | 20 ++++++++++++++++++ .../icon_heart_choose_light.png | Bin 0 -> 1722 bytes 4 files changed, 37 insertions(+), 6 deletions(-) create mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_heart_choose_light.png diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt index ccbc15bc1b..eefdd2252c 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt @@ -24,8 +24,8 @@ import com.mogo.module.v2x.view.V2XEventPanelHistoryCountView import com.mogo.module.v2x.voice.V2XVoiceCallbackListener import com.mogo.module.v2x.voice.V2XVoiceConstants import com.mogo.module.v2x.voice.V2XVoiceManager -import com.mogo.service.eventpanel.IEventPanelProvider import com.mogo.utils.logger.Logger +import com.mogo.utils.storage.SharedPrefsMgr /** @@ -52,6 +52,7 @@ class V2XEventPanelFragment : MvpFragmentPx*bV)=(R9FeUS8Iq>RTSR)%pIMvG(-%w3`DYG?(Ol*M(57VojWhVKQfp~gh60J zBm@~oP-BH4`NOCm6(mT6)>!zXFlUmkGvi}~K*;jdgM8HZh$NlooqKlQx7OL`-m4-? z(4IMGuf6tK-}?4i>zp%V48}-nW|;Gzne)eEa zA&n!0BUpV;Nk98&I@k-94?b&aJS~K5!-G%1*&hw3RXSlYbZB35x89QI(5U&Hj z=}%F*rY=EZ1wa+#L`t?0k*0AlttS`o1bG}+y>Zm&_@Qy12i96Qvp%SVPBsddi4Z#b zS*riYiukG_`u7V3YLhP_&6moJ}m;jh6l z@2u2$EHctw_CQ=i-i^#J!>RNUqu__@>PgxW4`EII2~lS+|`}iSZerBHala;B(qnP0`+luH4t0TDI^mdmZoMD%*$sIfzRPEjSGa9K&X_x0h zbpZDOGDl!gruq+0Mobg%Hsjm7B^Q zic&D+PvuCUn9Df;1zBE4kI=XjV zXu`Yc$3k$RjkFhaJq(P^4>YvAZ96+zH_dCIz3B~n(M01Lm$Q-QQ9W5GN^(WAHNh1V z*rfyl`LFTixu)*ex96jVvU zh;~sPrv_MT^DH^b1rIMX-Ap?{K@fK&JK}c9gIcR%#eis00U;kDYX?`(MIKRW@qZ)z$$r>OzqCC zLcmw`%S3~SF)*0AVs@xU7zCD2K@>>*V5k1{@&3$I(O>nXNq_8EyMZLIB-i3__$%r1 z-xt4dVYt-So`E@dr$}H~W4iw2Vgs#~MD5hS*kkm!Hux%-J-4H#t7}}qa4RF?m2S7JQzt%RyDK%Rde!wG3C6uC5pHlGLlu8q z9^8&JKCJ;6NFQ5zUVn0uAS9bxXJ~|k{WLje?rPiB#s4dAI&MkCd+_!Dd#>jrobEa4 z5!paM&??W466Lm(#M+OO&FyRaYuw}AY`!fb-Vs6VuMKtYAww@v#|-!$Qc_S5(c1TG zdJnC;ldt3*5kZJ}oT#sT2gF{MlKDQcW=pDXV0~=#e+oaPYu`ME>%YeQ7b-3GlV){N Qw*UYD07*qoM6N<$f~vVf&Hw-a literal 0 HcmV?d00001 From 739a7a5f55ea1c919b84c742f11a9b521b631d25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Sun, 15 Nov 2020 15:08:40 +0800 Subject: [PATCH 09/17] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=AD=E9=9F=B3?= =?UTF-8?q?=E7=9A=84=E4=BA=A4=E4=BA=92=E7=9A=84=E6=95=B0=E6=8D=AE=E4=B8=8A?= =?UTF-8?q?=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java index a9e376acef..695ac276f9 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java @@ -148,14 +148,12 @@ public class V2XEventUgcVH extends V2XBaseViewHolder { V2XServiceManager.getTanluManager().uploadRoadCondition(params); manualMarkingTrafficJam(1); - dataStatistics(1); } }); ivEventReportErr.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { manualMarkingTrafficJam(0); - dataStatistics(2); } }); } @@ -176,6 +174,12 @@ public class V2XEventUgcVH extends V2XBaseViewHolder { * 对道路事件进行反馈 */ void manualMarkingTrafficJam(int status) { + if (status == 1) { + dataStatistics(1); + } else if (status == 0) { + dataStatistics(2); + } + AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice("谢谢，您的反馈将帮助更多车友。", null); V2XServiceManager .getV2XRefreshModel() From 1089c9274c46eb3fb1e5189bf126478c431c43ae Mon Sep 17 00:00:00 2001 From: liujing Date: Sun, 15 Nov 2020 15:33:43 +0800 Subject: [PATCH 10/17] =?UTF-8?q?4.4=E4=BD=93=E9=AA=8C=E4=BC=98=E5=8C=96-T?= =?UTF-8?q?TS=E6=92=AD=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fragment/V2XScenarioHistoryFragment.java | 20 +++++++++++++++++++ .../v2x/fragment/V2XSurroundingFragment.java | 16 +++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java index 47dee0a670..525c4de03a 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java @@ -11,6 +11,7 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.mogo.commons.mvp.MvpFragment; +import com.mogo.commons.voice.AIAssist; import com.mogo.module.common.entity.V2XHistoryScenarioData; import com.mogo.module.v2x.R; import com.mogo.module.v2x.SpacesItemDecoration; @@ -21,6 +22,7 @@ import com.mogo.module.v2x.manager.V2XStatusDescriptor; import com.mogo.module.v2x.presenter.ScenarioHistoryPresenter; import com.mogo.module.v2x.utils.ThreadUtils; import com.mogo.module.v2x.utils.V2XSQLiteUtils; +import com.mogo.module.v2x.utils.V2XUtils; import com.mogo.module.v2x.view.V2XListEmptyView; import com.mogo.utils.logger.Logger; import com.mogo.utils.network.utils.GsonUtil; @@ -126,10 +128,28 @@ public class V2XScenarioHistoryFragment mClHistoryList.setVisibility(View.GONE); } mV2XScenarioHistoryAdapter.notifyDataSetChanged(); + ttsForHistoryFirstToday(); } }); } + /* + * 出行动态 TTS播报 + * */ + private void ttsForHistoryFirstToday() { + boolean hasBroadTts = V2XUtils.isFirstTodayWithKey("TTS_FOR_HISTORY_SELECTED"); + if (hasBroadTts == false) { + if (mV2XHistoryScenarioData.size() > 0) { + AIAssist.getInstance(V2XUtils.getApp()). + speakTTSVoice("小智为您记录了今天的出行事件", null); + } else { + AIAssist.getInstance(V2XUtils.getApp()). + speakTTSVoice("小智在这里为您记录今天的出行事件", null); + } + + } + } + @Override public void onResume() { super.onResume(); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java index ede7aaa93c..bf2f60b020 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java @@ -25,6 +25,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.commons.mvp.MvpFragment; +import com.mogo.commons.voice.AIAssist; import com.mogo.map.MogoLatLng; import com.mogo.map.marker.IMogoMarker; import com.mogo.map.marker.anim.OnMarkerAnimationListener; @@ -38,6 +39,7 @@ import com.mogo.module.v2x.adapter.V2XSurroundingAdapter; import com.mogo.module.v2x.entity.panel.SurroundingConstruction; import com.mogo.module.v2x.listener.SurroundingItemClickListener; import com.mogo.module.v2x.presenter.SurroundingEventPresenter; +import com.mogo.module.v2x.utils.V2XUtils; import com.mogo.module.v2x.view.SurroundingEventView; import com.mogo.module.common.view.NetworkLoadingView; import com.mogo.module.v2x.view.SurroundingMarginDecoration; @@ -189,8 +191,22 @@ public class V2XSurroundingFragment extends MvpFragment 0) { + AIAssist.getInstance(V2XUtils.getApp()). + speakTTSVoice("发现周边" + poiInfosList.size() + "条交通信息", null); + } else { + } + } + } private Map getPoiTypeMap(List list) { Map mPoiTypeMarkers = new HashMap<>(); From 2076713daf0bc6794d1567d110b5fa481b0b8a6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Sun, 15 Nov 2020 16:05:19 +0800 Subject: [PATCH 11/17] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E7=9A=84=E7=B1=BB=E5=9E=8B=E4=B8=8Eugc=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E4=B8=8D=E4=B8=80=E8=87=B4bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java index 695ac276f9..f842e7604a 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java @@ -139,11 +139,11 @@ public class V2XEventUgcVH extends V2XBaseViewHolder { // 上报事故 TanluUploadParams params = new TanluUploadParams( - mV2XRoadEventEntity.getPoiType(), + mNoveltyInfo.getPoiType(), IMogoTanluProvider.UPLOAD_FROM_STRATEGY_UGC, - mV2XRoadEventEntity.getNoveltyInfo().getInfoIdInt(), - new MogoLatLng(mV2XRoadEventEntity.getLocation().getLat(), - mV2XRoadEventEntity.getLocation().getLon()) + mNoveltyInfo.getInfoIdInt(), + new MogoLatLng(mNoveltyInfo.getLocation().getLat(), + mNoveltyInfo.getLocation().getLon()) ); V2XServiceManager.getTanluManager().uploadRoadCondition(params); From ff76a97cb0503f5d3f01ede426c3d01c3ade83b2 Mon Sep 17 00:00:00 2001 From: liujing Date: Sun, 15 Nov 2020 16:29:29 +0800 Subject: [PATCH 12/17] =?UTF-8?q?[add]=20=E5=9B=9E=E8=87=AA=E8=BD=A6-?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=82=B9=E5=87=BB=E7=8A=B6=E6=80=81selecter,?= =?UTF-8?q?=E7=BC=BA=E5=B0=91=E5=88=87=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/drawable/module_ext_drawable_shadow_bg.xml | 6 ++++++ .../src/main/res/layout/module_ext_layout_entrance.xml | 2 +- .../drawable/module_ext_drawable_shadow_bg_light.xml | 6 ++++++ 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 modules/mogo-module-extensions/src/main/res/drawable/module_ext_drawable_shadow_bg.xml create mode 100644 skin/mogo-skin-light/src/main/module-extensions-res/drawable/module_ext_drawable_shadow_bg_light.xml diff --git a/modules/mogo-module-extensions/src/main/res/drawable/module_ext_drawable_shadow_bg.xml b/modules/mogo-module-extensions/src/main/res/drawable/module_ext_drawable_shadow_bg.xml new file mode 100644 index 0000000000..1536ded683 --- /dev/null +++ b/modules/mogo-module-extensions/src/main/res/drawable/module_ext_drawable_shadow_bg.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml index 9ae44711a1..179e5063a0 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml +++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml @@ -20,7 +20,7 @@ android:id="@+id/module_entrance_id_move2_current_location" android:layout_width="@dimen/module_ext_operation_panel_width" android:layout_height="@dimen/module_ext_operation_panel_move2_height" - android:background="@drawable/module_ext_shadow_bkg" + android:background="@drawable/module_ext_drawable_shadow_bg" android:scaleType="centerInside" android:src="@drawable/module_map_ic_move2_current_location" app:layout_constraintBottom_toBottomOf="parent" diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable/module_ext_drawable_shadow_bg_light.xml b/skin/mogo-skin-light/src/main/module-extensions-res/drawable/module_ext_drawable_shadow_bg_light.xml new file mode 100644 index 0000000000..70e133acad --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-extensions-res/drawable/module_ext_drawable_shadow_bg_light.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file From ebef67d3d13c7ba0b52f9c25a142d2a23ba0c441 Mon Sep 17 00:00:00 2001 From: zhuangyan Date: Sun, 15 Nov 2020 16:51:24 +0800 Subject: [PATCH 13/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E9=9D=A2=E6=9D=BF=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/module/service/MogoServices.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) 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 e0e8324f3b..cf8436d75e 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 @@ -34,6 +34,7 @@ import com.mogo.map.navi.IMogoNaviListener; import com.mogo.map.navi.MogoCongestionInfo; import com.mogo.map.navi.MogoTraffic; import com.mogo.map.uicontroller.IMogoMapUIController; +import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.MogoModule; import com.mogo.module.common.MogoModulePaths; import com.mogo.module.common.entity.MarkerResponse; @@ -53,6 +54,7 @@ import com.mogo.module.service.refresh.AutoRefreshStrategy; import com.mogo.module.service.refresh.CustomRefreshStrategy; import com.mogo.module.service.refresh.RefreshObject; import com.mogo.module.service.strategy.CarIconDisplayStrategy; +import com.mogo.service.IMogoServiceApis; import com.mogo.service.adas.IMogoADASController; import com.mogo.service.cardmanager.IMogoCardManager; import com.mogo.service.connection.IMogoOnMessageListener; @@ -74,6 +76,7 @@ import com.mogo.utils.WorkThreadHandler; import com.mogo.utils.logger.Logger; import com.mogo.utils.network.RequestOptions; import com.mogo.utils.network.utils.GsonUtil; +import com.zhidao.smartv2x.common.utils.LoggerUtils; import org.json.JSONObject; @@ -331,6 +334,7 @@ public class MogoServices implements IMogoMapListener, } else { unregisterInternalUnWakeupWords(); stopAutoRefreshStrategy(); + closeAllPanel(); } } @@ -373,6 +377,16 @@ public class MogoServices implements IMogoMapListener, } }; + /** + * 关闭所有模块的控制面板 + */ + private void closeAllPanel() { + LoggerUtils.log("zy=======stop"); + MogoApisHandler.getInstance().getApis().getShareManager().dismissShareDialog(); + MogoApisHandler.getInstance().getApis().getOnlineCarPanelApi().hidePanel(); + MogoApisHandler.getInstance().getApis().getAdasControllerApi().closeADAS(); + } + public void init( Context context ) { mContext = context; From 0db3824f3aa0e5f64348d4209b46fcb29a736297 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Sun, 15 Nov 2020 17:16:50 +0800 Subject: [PATCH 14/17] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=AD=E9=9F=B3?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E6=B2=A1=E6=9C=89=E4=B8=8A=E4=BC=A0=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v2x/adapter/holder/V2XEventUgcVH.java | 21 ++++++++++--------- .../res/raw/scenario_road_event_data.json | 4 ++-- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java index f842e7604a..efa9981fe1 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java @@ -136,16 +136,6 @@ public class V2XEventUgcVH extends V2XBaseViewHolder { ivEventReportTrue.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - // 上报事故 - TanluUploadParams params = - new TanluUploadParams( - mNoveltyInfo.getPoiType(), - IMogoTanluProvider.UPLOAD_FROM_STRATEGY_UGC, - mNoveltyInfo.getInfoIdInt(), - new MogoLatLng(mNoveltyInfo.getLocation().getLat(), - mNoveltyInfo.getLocation().getLon()) - ); - V2XServiceManager.getTanluManager().uploadRoadCondition(params); manualMarkingTrafficJam(1); } @@ -175,6 +165,17 @@ public class V2XEventUgcVH extends V2XBaseViewHolder { */ void manualMarkingTrafficJam(int status) { if (status == 1) { + // 上报事故 + TanluUploadParams params = + new TanluUploadParams( + mNoveltyInfo.getPoiType(), + IMogoTanluProvider.UPLOAD_FROM_STRATEGY_UGC, + mNoveltyInfo.getInfoIdInt(), + new MogoLatLng(mNoveltyInfo.getLocation().getLat(), + mNoveltyInfo.getLocation().getLon()) + ); + V2XServiceManager.getTanluManager().uploadRoadCondition(params); + dataStatistics(1); } else if (status == 0) { dataStatistics(2); diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_road_event_data.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_road_event_data.json index 92470209e1..f491d85a2e 100644 --- a/modules/mogo-module-v2x/src/main/res/raw/scenario_road_event_data.json +++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_road_event_data.json @@ -30,7 +30,7 @@ "lat":39.966668, "lon":116.411211 }, - "poiType":"10006", + "poiType":"10003", "type":"CARD_TYPE_ROAD_CONDITION", "uploadType":"2", "userInfo":{ @@ -41,5 +41,5 @@ "userName":"零下的雨" } }, - "poiType":"10006" + "poiType":"10003" } \ No newline at end of file From 583fd43368e788e2f8d6230b2557c38225abfba9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Sun, 15 Nov 2020 17:18:18 +0800 Subject: [PATCH 15/17] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E5=90=8E=E5=8F=8D=E6=B3=A8=E5=86=8C=E8=AF=AD=E9=9F=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v2x/adapter/holder/V2XEventUgcVH.java | 32 +++++++++++-------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java index efa9981fe1..36847bf09e 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java @@ -77,23 +77,27 @@ public class V2XEventUgcVH extends V2XBaseViewHolder { @Override public void onViewDetachedFromWindow(View v) { //Logger.w(MODULE_NAME, "列表View V2XPushEventDetailVH 触发 onViewDetachedFromWindow"); - // 反注册语音交互 - V2XVoiceManager.INSTANCE - .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_FEEDBACK_YONG_DU_YES_UN_WAKEUP) - .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_FEEDBACK_YONG_DU_NO_UN_WAKEUP) - - .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_FEEDBACK_FENG_LU_YES_UN_WAKEUP) - .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_FEEDBACK_FENG_LU_NO_UN_WAKEUP) - - .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GU_YES_UN_WAKEUP) - .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GU_NO_UN_WAKEUP) - - .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GONG_YES_UN_WAKEUP) - .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GONG_NO_UN_WAKEUP); + unRegisterVoice(); } }); } + void unRegisterVoice() { + // 反注册语音交互 + V2XVoiceManager.INSTANCE + .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_FEEDBACK_YONG_DU_YES_UN_WAKEUP) + .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_FEEDBACK_YONG_DU_NO_UN_WAKEUP) + + .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_FEEDBACK_FENG_LU_YES_UN_WAKEUP) + .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_FEEDBACK_FENG_LU_NO_UN_WAKEUP) + + .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GU_YES_UN_WAKEUP) + .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GU_NO_UN_WAKEUP) + + .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GONG_YES_UN_WAKEUP) + .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GONG_NO_UN_WAKEUP); + } + @Override public void initView(V2XEventShowEntity v2XEventShowEntity) { try { @@ -164,6 +168,8 @@ public class V2XEventUgcVH extends V2XBaseViewHolder { * 对道路事件进行反馈 */ void manualMarkingTrafficJam(int status) { + unRegisterVoice(); + if (status == 1) { // 上报事故 TanluUploadParams params = From ae6346254ca1c8c3200f679f32f8a36e53374c7f Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Mon, 16 Nov 2020 10:47:45 +0800 Subject: [PATCH 16/17] opt --- .../roadcondition/service/MainServiceController.kt | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainServiceController.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainServiceController.kt index a471d75362..e6db78ac75 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainServiceController.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainServiceController.kt @@ -309,8 +309,11 @@ class MainServiceController { } onSuccess { if (it.result != null) { - Log.i(TAG, "upload message success id" + it.result.id) - sendUgcStatusReceiver(it.result.id, mPoiType, mFromType) + Log.i(TAG, "upload success id = " + it.result.id) + Log.i(TAG, "upload success mFromType = $mFromType") + if (mFromType == "6") { + sendUgcStatusReceiver(it.result.id, mPoiType, mFromType) + } } trackUploadServer(1) @@ -320,7 +323,10 @@ class MainServiceController { onError { Log.i(TAG, "$it upload message ${it.message}") trackUploadServer(2) - sendUgcStatusReceiver(0, mPoiType, mFromType) + Log.i(TAG, "upload onError mFromType = $mFromType") + if (mFromType == "6") { + sendUgcStatusReceiver(0, mPoiType, mFromType) + } // CosStatusController().videoAndThumbMap.clear() customSend?.invoke(false) } @@ -328,7 +334,7 @@ class MainServiceController { } private fun sendUgcStatusReceiver(id: Long, type: String?, fromType: String?) { - Log.e(TAG, "sendUgcStatusReceiver ----> id = $id ---type = $type --fromType = $fromType ") + Log.d(TAG, "sendUgcStatusReceiver ----> id = $id ---type = $type --fromType = $fromType ") var intent = Intent() intent.action = "com.v2x.ugc.upload.status" intent.putExtra("id", id) From 3d27dbd5d0d481296d7e37965301b81142bbb662 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 16 Nov 2020 11:26:22 +0800 Subject: [PATCH 17/17] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E9=92=88?= =?UTF-8?q?=E5=AF=B9=E4=BA=8B=E4=BB=B6=E9=9D=A2=E6=9D=BF=E7=9A=84=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E9=9A=90=E8=97=8F=E6=8E=A5=E5=8F=A3=E8=B0=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/module/v2x/V2XEventPanelModuleProvider.java | 10 ++++++++++ .../mogo/service/eventpanel/IEventPanelProvider.java | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XEventPanelModuleProvider.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XEventPanelModuleProvider.java index faca717a53..1ef623aac8 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XEventPanelModuleProvider.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XEventPanelModuleProvider.java @@ -99,4 +99,14 @@ public class V2XEventPanelModuleProvider implements public void showPanelWithSelectedItem(int item) { V2XEventPanelFragment.Companion.getInstance().showPanelWithSelectedItem(item); } + + @Override + public void showPanel() { + V2XEventPanelFragment.Companion.getInstance().showPanel(); + } + + @Override + public void hidePanel() { + V2XEventPanelFragment.Companion.getInstance().hidePanel(); + } } diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/eventpanel/IEventPanelProvider.java b/services/mogo-service-api/src/main/java/com/mogo/service/eventpanel/IEventPanelProvider.java index e02e7d0ceb..c779ab9632 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/eventpanel/IEventPanelProvider.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/eventpanel/IEventPanelProvider.java @@ -14,4 +14,14 @@ public interface IEventPanelProvider extends IMogoModuleProvider { */ void showPanelWithSelectedItem(int item); + /** + * 显示面板，默认选中第一个 + */ + void showPanel(); + + /** + * 隐藏面板 + */ + void hidePanel(); + }