From 6ad40202e9b7bfa90ac1c52cdb8f4b7b2c4a86d1 Mon Sep 17 00:00:00 2001 From: liujing Date: Wed, 25 Nov 2020 15:27:55 +0800 Subject: [PATCH 1/8] =?UTF-8?q?[add]=20m-ui=20.9=E5=9B=BE=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/values/dimens.xml | 6 +++--- .../module_services_online_car_panel_item.xml | 2 +- .../src/main/res/values-mdpi/dimens.xml | 2 +- ...es_online_car_panel_background_light.9.png | Bin 0 -> 2318 bytes ...es_online_car_panel_background_light.9.png | Bin 4428 -> 2318 bytes ...es_online_car_panel_background_light.9.png | Bin 4513 -> 0 bytes 6 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 skin/mogo-skin-light/src/main/module-services-res/drawable-ldpi/module_services_online_car_panel_background_light.9.png delete mode 100644 skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/module_services_online_car_panel_background_light.9.png diff --git a/modules/mogo-module-main/src/main/res/values/dimens.xml b/modules/mogo-module-main/src/main/res/values/dimens.xml index 3da2076696..30f61f1985 100644 --- a/modules/mogo-module-main/src/main/res/values/dimens.xml +++ b/modules/mogo-module-main/src/main/res/values/dimens.xml @@ -31,8 +31,8 @@ 1920px 0px - 0px - 0px + 2px + 2px 0px - 0px + 6px \ No newline at end of file diff --git a/modules/mogo-module-service/src/main/res/layout/module_services_online_car_panel_item.xml b/modules/mogo-module-service/src/main/res/layout/module_services_online_car_panel_item.xml index 6bc69fe366..577b0ba7d3 100644 --- a/modules/mogo-module-service/src/main/res/layout/module_services_online_car_panel_item.xml +++ b/modules/mogo-module-service/src/main/res/layout/module_services_online_car_panel_item.xml @@ -12,7 +12,7 @@ android:id="@+id/module_services_id_panel_item_avatar" android:layout_width="@dimen/module_services_panel_item_avatar_size" android:layout_height="@dimen/module_services_panel_item_avatar_size" - android:layout_marginStart="@dimen/dp_25" + android:layout_marginStart="@dimen/dp_24" android:src="@drawable/module_common_default_user_head" app:civ_border_color="@color/module_services_id_panel_item_avatar_border_color" app:civ_border_width="@dimen/module_services_id_panel_item_avatar_border_width" diff --git a/modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml index a5a63b9493..aa8cf42951 100644 --- a/modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml @@ -45,7 +45,7 @@ 16px 18px 5px - 20px + 28px 13px 42px 8.89px diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable-ldpi/module_services_online_car_panel_background_light.9.png b/skin/mogo-skin-light/src/main/module-services-res/drawable-ldpi/module_services_online_car_panel_background_light.9.png new file mode 100644 index 0000000000000000000000000000000000000000..68f94c1278840d5e1a16f144f38b39086325a0b9 GIT binary patch literal 2318 zcmV+p3Gw!cP)VX-sx&aUaYecyGUE`@3|M1Zu#Qh~O{Cavptib!8K@HPC_uO` z6d6&c0ja1lPZohm09A-ml>%l_0bAzEl*WJ>`)PG`^$n)hPN25Bg8AghlZyahofH}8 z;x4F~D!GgEm|0Mu+8{<;ohy@_rB!OR8lL~!*x0z(1=K`9Loo5~0mwg?iw7|In7g$t zR`N4g(FRsir=m&&uE=7gjF%yhLY);eCZLsiz5Zu5n?37*+7VDKW=>weetizW-Ip+9 z++4;>R{|==#Y>^c2vjXza`%>QP5=$mK%rn}yoPHgsQVK@O$2m51?eeFKmaml1F21YuU)$~&x&?y%v1{Zj$@`M z+)GN)?#$w@M5L*c!<6a-tJ3)eGO(!B2~>-n2cd*`Pr`)7L zM461#vWTB~tTf70+#aD;pFMl_KB?3dOPxT+N#YquMoYG$-KEYLphd05v=r<%_b$sM z#A7Cbu2|w`#Egpzbp}8occ9y6SQ%vn+H$!&*bF42?-CU55m!&5&X|l|N)k6k^06hN zP!<gHJdv?h6;A2dsJ3pX4&QLA_2*a zEVK1T>?RPaOe0G~oSAo4ZG1 zrRL@_sx;SC0(z(ypcs6o4NwpInObSohN`)_rbr2qeO4o&)5NADpyLeayl4H)h$3T@ zS+%K?yE_4$XF$ih2I^ryvy$K`D3Z;MBDp%vm|Q+ppkDPe<&%%d;%f0O!Pe*?py?^p z<9?=^(QUOR2g%(XVWtYy=YFOuo7>!-xqAN;>Ty4l*O^tBd<00Y%#b?!p-^x8nIc|R z9Ez+mh#{E&mqLB%XC{i79HLPvJj0vM>S-#}`+g=wab&NIo_ojWX%FFEP~Tex@x6*~+9k2b{Lc z4@Eyylt(p()tOQ;h6a`@&|&Cj3XodOS=W*geV!iBVd-aDz{=QJ=MY&Ot*7qtzV|a_ z^3iHdu1@ameRX+X`Uq!~kpqMzx?=t7yQrLIul z`Bk>dq2|w(kN1M`Mv@5zMm;wTmvZFJQz2d z&D4PoML&}#AQ3y&WMn|%f#bA+df(6FPdyx#1WOO- zu=F!yvbm~C1~v5<>U}>`W^@}&qeu=jZG{d+KT~;}w8l)6kO*wEp9=N1pXqS*P)6sf zv2XwAbD10>x{Y()nof(~}Gf*gq>YJo5EsVvzRp8MX;`VX?0Y{`&@-;yWD0Exkii(lbeA%GqE{1RU!KKaeCN)cbGQ|c&;3k-ST_pfuC6H4 zob$`e%jZNw8t>+9WFALR>PNP=wr=>`&$MN9&CN-n&3r!p8Lpiebo_d^&FzDF^y<~C zr$GK|zVMZ{EE57EI(~ki0?&HUg zKgK!Z+-VJmX-(5HFuMX82X%^q^(<5CQM${oft>_9#q9MxHa?e=G{@sKXQRqlTGLdQ z+goMuOl>91JbDSKo1+T_6&8LZCZVh?(PgtaE|N{ z1HG4K=3(YFOLNUIkiBjhobIO94DJ*IoT0lv2$o?0rx?VvHnkpYyS|s(u8)2gVD!@! oe*APrCvZnUuHqVX-sx&aUaYecyGUE`@3|M1Zu#Qh~O{Cavptib!8K@HPC_uO` z6d6&c0ja1lPZohm09A-ml>%l_0bAzEl*WJ>`)PG`^$n)hPN25Bg8AghlZyahofH}8 z;x4F~D!GgEm|0Mu+8{<;ohy@_rB!OR8lL~!*x0z(1=K`9Loo5~0mwg?iw7|In7g$t zR`N4g(FRsir=m&&uE=7gjF%yhLY);eCZLsiz5Zu5n?37*+7VDKW=>weetizW-Ip+9 z++4;>R{|==#Y>^c2vjXza`%>QP5=$mK%rn}yoPHgsQVK@O$2m51?eeFKmaml1F21YuU)$~&x&?y%v1{Zj$@`M z+)GN)?#$w@M5L*c!<6a-tJ3)eGO(!B2~>-n2cd*`Pr`)7L zM461#vWTB~tTf70+#aD;pFMl_KB?3dOPxT+N#YquMoYG$-KEYLphd05v=r<%_b$sM z#A7Cbu2|w`#Egpzbp}8occ9y6SQ%vn+H$!&*bF42?-CU55m!&5&X|l|N)k6k^06hN zP!<gHJdv?h6;A2dsJ3pX4&QLA_2*a zEVK1T>?RPaOe0G~oSAo4ZG1 zrRL@_sx;SC0(z(ypcs6o4NwpInObSohN`)_rbr2qeO4o&)5NADpyLeayl4H)h$3T@ zS+%K?yE_4$XF$ih2I^ryvy$K`D3Z;MBDp%vm|Q+ppkDPe<&%%d;%f0O!Pe*?py?^p z<9?=^(QUOR2g%(XVWtYy=YFOuo7>!-xqAN;>Ty4l*O^tBd<00Y%#b?!p-^x8nIc|R z9Ez+mh#{E&mqLB%XC{i79HLPvJj0vM>S-#}`+g=wab&NIo_ojWX%FFEP~Tex@x6*~+9k2b{Lc z4@Eyylt(p()tOQ;h6a`@&|&Cj3XodOS=W*geV!iBVd-aDz{=QJ=MY&Ot*7qtzV|a_ z^3iHdu1@ameRX+X`Uq!~kpqMzx?=t7yQrLIul z`Bk>dq2|w(kN1M`Mv@5zMm;wTmvZFJQz2d z&D4PoML&}#AQ3y&WMn|%f#bA+df(6FPdyx#1WOO- zu=F!yvbm~C1~v5<>U}>`W^@}&qeu=jZG{d+KT~;}w8l)6kO*wEp9=N1pXqS*P)6sf zv2XwAbD10>x{Y()nof(~}Gf*gq>YJo5EsVvzRp8MX;`VX?0Y{`&@-;yWD0Exkii(lbeA%GqE{1RU!KKaeCN)cbGQ|c&;3k-ST_pfuC6H4 zob$`e%jZNw8t>+9WFALR>PNP=wr=>`&$MN9&CN-n&3r!p8Lpiebo_d^&FzDF^y<~C zr$GK|zVMZ{EE57EI(~ki0?&HUg zKgK!Z+-VJmX-(5HFuMX82X%^q^(<5CQM${oft>_9#q9MxHa?e=G{@sKXQRqlTGLdQ z+goMuOl>91JbDSKo1+T_6&8LZCZVh?(PgtaE|N{ z1HG4K=3(YFOLNUIkiBjhobIO94DJ*IoT0lv2$o?0rx?VvHnkpYyS|s(u8)2gVD!@! oe*APrCvZnUuHq=t8OtCsNsKK^BH5GdlL_(BBxD(d z?4QgGLZz}qB1=fgccy;7KkmJ+b6@8<@AvaQ=Q+=FZwkuRS_ljU0{{Rao3j=e_VYI9 z;s>$s3wv7p0Kg#;8w*qW$jPtwf2O%R9_jU-v?=Vpz`!vS5ozGW--q|Qtu>6kaixL| z)v}CbJ91FCQkU{f%&$u2EA^^oa-!YGUs_x;J**XN7MELbTuUXzhug-ka1a)@(7rlN zYL1xx*|Ktm@U^#XyXehOjbK{XO2NSWsF5GDt?h&dtCCG0a>AasWFZ95#wFA8b2T?ic3*LeaQD?>hQZ`T1t7|}enRAw1ru5= zX?b7rK!td6RzebR9?LBjnKf3{5}0_@NJbQuEuYApUDHqOALW{xp~siYT>nOo@b&e* zI*zBcrCWVMI4n50qjk%vcq(YAXT!HKB_kqd_w@9b>01L(#-qJ66OZZM*9cpZOzp7e zTw7lWlJntP3y7a*uGjqN;Jcpw`?@1*%bjM3emw3$#XjmNDlD8V9g*Npu`7Gd^i$Ey zDUDt13|*h?3!Doj<(*OKWeF6Zm8#0T0Iq`P$Bhy|on9Vxz$pk^>a4IV1VTds;!C@P zb+y#RgaJZ4ud;yTu7i80Jsf2Xe@_w~zqK}D3Ys*>eTwf97|c;~Y%j5&1H@K#0nAJ> ziRXY9Js|0s{iPeNd9I*{JlS_NHK8#Iqz2xy`%MD@$u5M zkrWrIeGdIQMeO2vxWKk2Czx9 zM!Dn|I+byJOIuwdPA+;`CQsAjw>l8@a2Fz4BgOZ3rDjqot>e6EhFIXB8&?*^V1 z76(gbs3d7nt-gxj?N)u_)&nHl_2%B_MF;lNEK58yU3g6Dqjj0OB#eh7NIDOXnnX^T1FIf1oA zU?zTDG6qtVE+^d+)p82S+#Spvm{S7rj9@f1RDtPRuoA-`)Oksoit#7ymys1cUsWa< z&mh`-sovy_P1v;PoEF_Z_L&J<_x!RxlQ#Jp2sfRvFb!K`RwHo=%h0A2F^3mRAE8YW zz`>_#VA;G3`jR=pr?_`pvUZiq|%Ia-wzYi&{>9FhKptu<$3AXT`~aDLx)lwsze=L7JJ5=p})y z<|CKS*`}t8zLC-I z({qIW(x!vrbJdnLLs!zLvOl6!<5@`?dbhX~gY850)dhIvSM`4cDVTU>wj?}N%A1@B z+~`Uae4tMabM+jMr>|8bD3;ZeCCSke*9s@Z5`&#E5zU6%#i#Vu3(!Tat@m;03qR#^ z5?j1%x)t0aT8?cOnX!8OQf+7rmA^m8u*S1+&L>&UOO}CS4~%1er#0xSJ9-u;x!jY~Pu}WXs~%Jj54d#c29sQ-xtVO@-)gVW6i%f zXnfsm9o9UDbJN#~#_OD~PREF0!vowqZtSI;WqHx%SXL~nW82wqL>;LRn@lnNw&P-# zMsTQdZ>xSBn6Sh{W}xpGMr{R{N_h1#X7ea1%{iI4^H>~zH%{ayB0BKSk_FkER(*TY z?Rn%{YZgW2B$A;7uj}s&`>{T^dWiahrY0suMF=60$bGYQSmFZi8EXb&kkJ2xA4P0! zS!={pKe6`ku5#xkn?F@?P{=tqccPD>jx0_>XJcn(nQJgW?nzcP3m-E!Zcy)jnoee9 z=hh$E=nc)HI9I_Do&3_^0|9n{-kJM8oo_zp*PSJnbo5=YqXy~6c&U&I=LQ(WTK_R! zU9a#4YCLnHti5OON@6ry>6Yz4Oz;iMb=bf?%9_Nbptqo1iRUb1y9dGNJiL1rBIzG~ z4G9sGvmeaja+Qz_@cp9L^(W+hlgb7b&&;#0lhG+u|OtC=vL-<^)rZy6Rav>ldxu0ww*P^cmljYl#GjGDIvS> zz!7C6==fKjWxsDvg*oQGBJAV~7RAiHAFQ`P$Wnie5{Sb(@KXlgZj z{KaNfs%-y!N@&1ui`v&H_L%B24ktECqV&xT*p8EzUCtjNIyIzd z&3ZmeU!w>jJL1*i9=|vZb!;HJD5I!s&@K}6=mr1ENNMxz2o4Fhy>yj3ArS+0A|V~v z2r%R)fAq#P2QOM*G-p5y2?`dk(30?sH63npuqjr23m4Kc9I{J`_Kj&*=E%tofo}tS zjYxlw#ie37)6AvFU570Cs4D{se~oh{7F3+%ax6*J+)(qv|C^6XdxH1}Li4@<_y@@H&6%J=?aS|{IBk>S6KVkMxnv?E%T>c`C zjFJ`{F++1u5;kCNQSwY5X;s8)j{R~S26)Izb(f22j1~2hTaEfFZ~PIE$^hIuHO-Da z(~1I0DIhM^ghrm~a{Ze@EsZ`Fb>4KK|JYw8=X?iKearLl6welGTZ zKrJ?4xAkZ<1iR*VHsqBJn2{zMfJW_>?_{SYj-!J?tgKd>>M%8Vf6!qaCa{3}uW*PP zQ$RWwA`5TWFCah+bpM1U#|n!$_@R&eO<}i2EyW1u(ob46k-b^s)ONdrynwr9y&`Tg|@*cPEz!0d?P#OvyR{ z?>23DJHPxb7_{U>nb-#`OCUOMNLPA=S4wb1IAqGSWAQVS$-Mi=Cw@p%x>;h**?xRe zMF$-yAEXcA@-L$=-kKdT+@6jvac7r*DLkD(&d9H*>BVKFryG72?{1snL13vX?Bn`P zHkXUVNs>)#JiHm>U%q#IAwad!B)Xi?zblDKwnaNF>^ToG3?@bWGLOE$_N6u$5F>Kw zmNO9xB)*DFqz>c#st4M$8gnG1<f;r*?2Qh~7JnAU?{8rK-05UqOfXZ?7m~q!^LcQk z&088_T#0q_SRNd4m;~*Ic$)`Iv0^r9K>Q1Y-Rl`5!y(UR?4|UXE1%_9Ns1?sjnCQZ zU+npWAAbJT9fgB(Gf8$?5$aEgFE)N6gpSW7WNxMb*R^VP4DcI^GK9WJy5i;Nr9J$?GelXk3UR@w7(WFWRXR%bT9eg!6T zIqj5N$6ff)`Yi6DE|ecxiTP39ZdGC#a+irRo=KqEIu4A=Ebnc<-!H(qviExS5+yV)q6vc6*u~vvP7zlacp-D0ZY=?;_D4 za_q2%8gQgN`lmG3<5$rv4&2AMY;T=0&391xdOjJ{^pM8&p8-7t;bcD$+SM4gFwA$Z za#YaQ$9WxgdJZRy+R)L_iTQ8A2mqy8zWqp61WQqUcN?kYc%zv@T>N{ zOJPS*vXIwp^Orxj9AxdO)qLB24>F5DxRChjLj@goC&K$ItIUvh_ zhgYEM$tXb$z}wZu1#|$_F`i{BS_Oj1eue;l9xfPIwoBGIpBUKOm$o|`AyVSxWOYbO z0g(TFKmef*mjejt2s>xWUJ$0{*zf#&FJMyYDRF?O3gv%khQ1`iEu7#l5-TwF8Lake z??ZF*u_ApLt&_%f{IHXe28?AOzu9HeI4$QAY-qad*(CapNx*QqV7{Xz1Y*-&N|I)l#jtv*uC0gIyML Tec#IdO9HU5w6&-+^Njl+YpqPV diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/module_services_online_car_panel_background_light.9.png b/skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/module_services_online_car_panel_background_light.9.png deleted file mode 100644 index 7ccbeaa5824db038e8766a01033cb7d6dfec3931..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4513 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 From 45fdd0fad1876a7f15287334aecc8d1f98429eab Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 25 Nov 2020 16:06:52 +0800 Subject: [PATCH 2/8] ........ --- gradle.properties | 157 +++++++++++++++++++++------------------------- 1 file changed, 71 insertions(+), 86 deletions(-) diff --git a/gradle.properties b/gradle.properties index 52a9cbb446..a059dec4fe 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,30 +7,7 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. #org.gradle.jvmargs=-Xmx1536m -org.gradle.daemon=true -org.gradle.configureondemand=true -org.gradle.parallel=true org.gradle.jvmargs=-Xmx4096m - -#开启gradle缓存 -org.gradle.caching=true -android.enableBuildCache=true - -#开启kotlin的增量和并行编译 -kotlin.incremental=true -kotlin.incremental.java=true -kotlin.caching.enabled=true -#开启kotlin并行编译 -kotlin.parallel.tasks.in.project=true - -#优化kapt -#并行运行kapt1.2.60版本以上支持 -kapt.use.worker.api=true -#增量编译 kapt1.3.30版本以上支持 -kapt.incremental.apt=true -#kapt avoiding 如果用kapt依赖的内容没有变化，会完全重用编译内容，省掉app:kaptGenerateStubsDebugKotlin的时间 -kapt.include.compile.classpath=false - # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects @@ -41,7 +18,7 @@ kapt.include.compile.classpath=false android.useAndroidX=true # Automatically convert third-party libraries to use AndroidX android.enableJetifier=true - +org.gradle.parallel=true ## maven 配置 RELEASE_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-releases/ @@ -52,86 +29,94 @@ PASSWORD=xintai2018 RELEASE=false # 模块版本 ## 工程内模块 -MOGO_COMMONS_VERSION=2.0.7 -MOGO_UTILS_VERSION=2.0.7 -MAP_AMAP_VERSION=2.0.7 -MAP_AUTONAVI_VERSION=2.0.7 -MOGO_MAP_VERSION=2.0.7 -MOGO_MAP_API_VERSION=2.0.7 -MOGO_SERVICE_VERSION=2.0.7 -MOGO_SERVICE_API_VERSION=2.0.7 -MOGO_CONNECTION_VERSION=2.0.7 -MOGO_MODULE_APPS_VERSION=2.0.7 -MOGO_MODULE_NAVI_VERSION=2.0.7 -MOGO_MODULE_SHARE_VERSION=2.0.7 -MOGO_MODULE_COMMON_VERSION=2.0.7 -MOGO_MODULE_MAIN_VERSION=2.0.7 -MOGO_MODULE_MAP_VERSION=2.0.7 -MOGO_MODULE_SERVICE_VERSION=2.0.7 -MOGO_MODULE_EXTENSIONS_VERSION=2.0.7 -MOGO_MODULE_SEARCH_VERSION=2.0.7 -MOGO_MODULE_BACK_VERSION=2.0.7 -MOGO_MODULE_GPS_SIMULATOR_VERSION=2.0.7 -MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION=2.0.7 -MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION=2.0.7 -MOGO_MODULE_AUTHORIZE_VERSION=2.0.7 -MOGO_MODULE_GUIDE_VERSION=2.0.7 -MOGO_MODULE_MEDIA_VERSION=2.0.7 -MOGO_MODULE_MAIN_LAUNCHER_VERSION=2.0.7 -MOGO_MODULE_MAIN_INDEPENDENT_VERSION=2.0.7 -MOGO_MODULE_V2X_VERSION=2.0.7 +MOGO_COMMONS_VERSION=2.0.2 +MOGO_UTILS_VERSION=2.0.0 +MAP_AMAP_VERSION=2.0.0 +MAP_AUTONAVI_VERSION=2.0.0 +MOGO_MAP_VERSION=2.0.0 +MOGO_MAP_API_VERSION=2.0.0 +MOGO_SERVICE_VERSION=2.0.0 +MOGO_SERVICE_API_VERSION=2.0.2 +MOGO_CONNECTION_VERSION=2.0.0 +MOGO_MODULE_APPS_VERSION=2.0.0 +MOGO_MODULE_NAVI_VERSION=2.0.0 +MOGO_MODULE_SHARE_VERSION=2.0.0 +MOGO_MODULE_COMMON_VERSION=2.0.0 +MOGO_MODULE_MAIN_VERSION=2.0.0 +MOGO_MODULE_MAP_VERSION=2.0.0 +MOGO_MODULE_SERVICE_VERSION=2.0.0 +MOGO_MODULE_EXTENSIONS_VERSION=2.0.0 +MOGO_MODULE_SEARCH_VERSION=2.0.0 +MOGO_MODULE_BACK_VERSION=2.0.0 +MOGO_MODULE_GPS_SIMULATOR_VERSION=2.0.0 +MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION=2.0.0 +MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION=2.0.0 +MOGO_MODULE_AUTHORIZE_VERSION=2.0.0 +MOGO_MODULE_GUIDE_VERSION=2.0.0 +MOGO_MODULE_MEDIA_VERSION=2.0.0 +MOGO_MODULE_MAIN_LAUNCHER_VERSION = 2.0.0 +MOGO_MODULE_MAIN_INDEPENDENT_VERSION = 2.0.0 +MOGO_MODULE_V2X_VERSION=2.0.0 # 基础服务实现：passport、socket、location -MOGO_BASE_SERVICES_APK_VERSION=2.0.7 -MOGO_BASE_SERVICES_SDK_VERSION=2.0.7 +MOGO_BASE_SERVICES_APK_VERSION = 2.0.0 +MOGO_BASE_SERVICES_SDK_VERSION = 2.0.0 +MOGO_BASE_WEBSOCKET_SDK_VERSION = 1.0.0 ## 工程外部模块 # 探路 -MOGO_MODULE_TANLU_VERSION=2.0.7 +MOGO_MODULE_TANLU_VERSION=2.0.0 # 视频引导 -MOGO_MODULE_GUIDESHOW_VERSION=2.0.7 +MOGO_MODULE_GUIDESHOW_VERSION=2.0.0 # 推送 -MOGO_MODULE_PUSH_VERSION=2.0.7 -MOGO_MODULE_PUSH_BASE_VERSION=2.0.7 -MOGO_MODULE_PUSH_NOOP_VERSION=2.0.7 +MOGO_MODULE_PUSH_VERSION=2.0.0 +MOGO_MODULE_PUSH_BASE_VERSION=2.0.0 +MOGO_MODULE_PUSH_NOOP_VERSION=2.0.0 # 探路上报和分享模块 -TANLULIB_VERSION=2.0.7 -MOGO_TANLU_API_VERSION=2.0.7 +TANLULIB_VERSION=2.0.0 +MOGO_TANLU_API_VERSION=2.0.0 #左侧面板模块 -MOGO_MODULE_LEFT_PANEL_VERSION=2.0.7 -MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.0.7 +MOGO_MODULE_LEFT_PANEL_VERSION=2.0.0 +MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.0.0 # 小控件 -MOGO_MODULE_WIDGETS_VERSION=2.0.7 +MOGO_MODULE_WIDGETS_VERSION=2.0.0 # obu -MOGO_MODULE_OBU_VERSION=2.0.7 +MOGO_MODULE_OBU_VERSION=2.0.0 # 皮肤 -MOGO_SKIN_SUPPORT_VERSION=2.0.7 -MOGO_SKIN_LIGHT_VERSION=2.0.7 -MOGO_SKIN_SUPPORT_IMPL_VERSION=2.0.7 -MOGO_SKIN_SUPPORT_NOOP_VERSION=2.0.7 -SKIN_SUPPORT_VERSION=2.0.7 -SKIN_SUPPORT_APPCOMPAT_VERSION=2.0.7 -SKIN_SUPPORT_CARDVIEW_VERSION=2.0.7 -SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.0.7 -SKIN_SUPPORT_DESIGN_VERSION=2.0.7 +MOGO_SKIN_SUPPORT_VERSION=2.0.0 +MOGO_SKIN_LIGHT_VERSION=2.0.0 +MOGO_SKIN_SUPPORT_IMPL_VERSION=2.0.0 +MOGO_SKIN_SUPPORT_NOOP_VERSION=2.0.0 +SKIN_SUPPORT_VERSION=2.0.0 +SKIN_SUPPORT_APPCOMPAT_VERSION=2.0.0 +SKIN_SUPPORT_CARDVIEW_VERSION=2.0.0 +SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.0.0 +SKIN_SUPPORT_DESIGN_VERSION=2.0.0 # 闪屏页 -MOGO_MODULE_SPLASH_VERSION=2.0.7 -MOGO_MODULE_SPLASH_NOOP_VERSION=2.0.7 +MOGO_MODULE_SPLASH_VERSION=2.0.0 +MOGO_MODULE_SPLASH_NOOP_VERSION=2.0.0 # monitor -MOGO_MODULE_MONITOR_VERSION=2.0.7 +MOGO_MODULE_MONITOR_VERSION=2.0.0 # bugly -CRASHREPORT_VERSION=2.0.7 -CRASHREPORT_BUGLY_VERSION=2.0.7 -CRASHREPORT_NOOP_VERSION=2.0.7 +CRASHREPORT_VERSION=2.0.0 +CRASHREPORT_BUGLY_VERSION=2.0.0 +CRASHREPORT_NOOP_VERSION=2.0.0 ## tts -TTS_BASE_VERSION=2.0.7 -TTS_DI_VERSION=2.0.7 -TTS_ZHI_VERSION=2.0.7 -TTS_NOOP_VERSION=2.0.7 +TTS_BASE_VERSION=1.0.0 +TTS_DI_VERSION=1.0.0 +TTS_ZHI_VERSION=1.0.0 +TTS_NOOP_VERSION=1.0.0 +# 自研地图 +MAP_CUSTOM_VERSION=1.2.1.9 +MOGO_MODULES_MVISION_VERSION=1.0.0 +# httpdns +HTTPDNS_TENCENT_VERSION = 1.0.0 +HTTPDNS_BASE_VERSION = 1.0.0 +HTTPDNS_NOOP_VERSION = 1.0.0 ######## 外部依赖引用 # 车聊聊 -CARCHATTING_VERSION=1.6.5-SNAPSHOT +CARCHATTING_VERSION=1.9.7.1 # 车聊聊接口 -CARCHATTINGPROVIDER_VERSION=1.1.7 +CARCHATTINGPROVIDER_VERSION=1.4.1 # loglib LOGLIB_VERSION = 1.0.4 From 11fa6fa8fadbff6dbe1eedfe19690f04ac9a9c26 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 25 Nov 2020 16:16:38 +0800 Subject: [PATCH 3/8] update callchat --- gradle.properties | 157 +++++++++++++++++++++++++--------------------- 1 file changed, 86 insertions(+), 71 deletions(-) diff --git a/gradle.properties b/gradle.properties index a059dec4fe..3122fa68b7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,30 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. #org.gradle.jvmargs=-Xmx1536m +org.gradle.daemon=true +org.gradle.configureondemand=true +org.gradle.parallel=true org.gradle.jvmargs=-Xmx4096m + +#开启gradle缓存 +org.gradle.caching=true +android.enableBuildCache=true + +#开启kotlin的增量和并行编译 +kotlin.incremental=true +kotlin.incremental.java=true +kotlin.caching.enabled=true +#开启kotlin并行编译 +kotlin.parallel.tasks.in.project=true + +#优化kapt +#并行运行kapt1.2.60版本以上支持 +kapt.use.worker.api=true +#增量编译 kapt1.3.30版本以上支持 +kapt.incremental.apt=true +#kapt avoiding 如果用kapt依赖的内容没有变化，会完全重用编译内容，省掉app:kaptGenerateStubsDebugKotlin的时间 +kapt.include.compile.classpath=false + # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects @@ -18,7 +41,7 @@ org.gradle.jvmargs=-Xmx4096m android.useAndroidX=true # Automatically convert third-party libraries to use AndroidX android.enableJetifier=true -org.gradle.parallel=true + ## maven 配置 RELEASE_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-releases/ @@ -29,94 +52,86 @@ PASSWORD=xintai2018 RELEASE=false # 模块版本 ## 工程内模块 -MOGO_COMMONS_VERSION=2.0.2 -MOGO_UTILS_VERSION=2.0.0 -MAP_AMAP_VERSION=2.0.0 -MAP_AUTONAVI_VERSION=2.0.0 -MOGO_MAP_VERSION=2.0.0 -MOGO_MAP_API_VERSION=2.0.0 -MOGO_SERVICE_VERSION=2.0.0 -MOGO_SERVICE_API_VERSION=2.0.2 -MOGO_CONNECTION_VERSION=2.0.0 -MOGO_MODULE_APPS_VERSION=2.0.0 -MOGO_MODULE_NAVI_VERSION=2.0.0 -MOGO_MODULE_SHARE_VERSION=2.0.0 -MOGO_MODULE_COMMON_VERSION=2.0.0 -MOGO_MODULE_MAIN_VERSION=2.0.0 -MOGO_MODULE_MAP_VERSION=2.0.0 -MOGO_MODULE_SERVICE_VERSION=2.0.0 -MOGO_MODULE_EXTENSIONS_VERSION=2.0.0 -MOGO_MODULE_SEARCH_VERSION=2.0.0 -MOGO_MODULE_BACK_VERSION=2.0.0 -MOGO_MODULE_GPS_SIMULATOR_VERSION=2.0.0 -MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION=2.0.0 -MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION=2.0.0 -MOGO_MODULE_AUTHORIZE_VERSION=2.0.0 -MOGO_MODULE_GUIDE_VERSION=2.0.0 -MOGO_MODULE_MEDIA_VERSION=2.0.0 -MOGO_MODULE_MAIN_LAUNCHER_VERSION = 2.0.0 -MOGO_MODULE_MAIN_INDEPENDENT_VERSION = 2.0.0 -MOGO_MODULE_V2X_VERSION=2.0.0 +MOGO_COMMONS_VERSION=2.0.7 +MOGO_UTILS_VERSION=2.0.7 +MAP_AMAP_VERSION=2.0.7 +MAP_AUTONAVI_VERSION=2.0.7 +MOGO_MAP_VERSION=2.0.7 +MOGO_MAP_API_VERSION=2.0.7 +MOGO_SERVICE_VERSION=2.0.7 +MOGO_SERVICE_API_VERSION=2.0.7 +MOGO_CONNECTION_VERSION=2.0.7 +MOGO_MODULE_APPS_VERSION=2.0.7 +MOGO_MODULE_NAVI_VERSION=2.0.7 +MOGO_MODULE_SHARE_VERSION=2.0.7 +MOGO_MODULE_COMMON_VERSION=2.0.7 +MOGO_MODULE_MAIN_VERSION=2.0.7 +MOGO_MODULE_MAP_VERSION=2.0.7 +MOGO_MODULE_SERVICE_VERSION=2.0.7 +MOGO_MODULE_EXTENSIONS_VERSION=2.0.7 +MOGO_MODULE_SEARCH_VERSION=2.0.7 +MOGO_MODULE_BACK_VERSION=2.0.7 +MOGO_MODULE_GPS_SIMULATOR_VERSION=2.0.7 +MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION=2.0.7 +MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION=2.0.7 +MOGO_MODULE_AUTHORIZE_VERSION=2.0.7 +MOGO_MODULE_GUIDE_VERSION=2.0.7 +MOGO_MODULE_MEDIA_VERSION=2.0.7 +MOGO_MODULE_MAIN_LAUNCHER_VERSION=2.0.7 +MOGO_MODULE_MAIN_INDEPENDENT_VERSION=2.0.7 +MOGO_MODULE_V2X_VERSION=2.0.7 # 基础服务实现：passport、socket、location -MOGO_BASE_SERVICES_APK_VERSION = 2.0.0 -MOGO_BASE_SERVICES_SDK_VERSION = 2.0.0 -MOGO_BASE_WEBSOCKET_SDK_VERSION = 1.0.0 +MOGO_BASE_SERVICES_APK_VERSION=2.0.7 +MOGO_BASE_SERVICES_SDK_VERSION=2.0.7 ## 工程外部模块 # 探路 -MOGO_MODULE_TANLU_VERSION=2.0.0 +MOGO_MODULE_TANLU_VERSION=2.0.7 # 视频引导 -MOGO_MODULE_GUIDESHOW_VERSION=2.0.0 +MOGO_MODULE_GUIDESHOW_VERSION=2.0.7 # 推送 -MOGO_MODULE_PUSH_VERSION=2.0.0 -MOGO_MODULE_PUSH_BASE_VERSION=2.0.0 -MOGO_MODULE_PUSH_NOOP_VERSION=2.0.0 +MOGO_MODULE_PUSH_VERSION=2.0.7 +MOGO_MODULE_PUSH_BASE_VERSION=2.0.7 +MOGO_MODULE_PUSH_NOOP_VERSION=2.0.7 # 探路上报和分享模块 -TANLULIB_VERSION=2.0.0 -MOGO_TANLU_API_VERSION=2.0.0 +TANLULIB_VERSION=2.0.7 +MOGO_TANLU_API_VERSION=2.0.7 #左侧面板模块 -MOGO_MODULE_LEFT_PANEL_VERSION=2.0.0 -MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.0.0 +MOGO_MODULE_LEFT_PANEL_VERSION=2.0.7 +MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.0.7 # 小控件 -MOGO_MODULE_WIDGETS_VERSION=2.0.0 +MOGO_MODULE_WIDGETS_VERSION=2.0.7 # obu -MOGO_MODULE_OBU_VERSION=2.0.0 +MOGO_MODULE_OBU_VERSION=2.0.7 # 皮肤 -MOGO_SKIN_SUPPORT_VERSION=2.0.0 -MOGO_SKIN_LIGHT_VERSION=2.0.0 -MOGO_SKIN_SUPPORT_IMPL_VERSION=2.0.0 -MOGO_SKIN_SUPPORT_NOOP_VERSION=2.0.0 -SKIN_SUPPORT_VERSION=2.0.0 -SKIN_SUPPORT_APPCOMPAT_VERSION=2.0.0 -SKIN_SUPPORT_CARDVIEW_VERSION=2.0.0 -SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.0.0 -SKIN_SUPPORT_DESIGN_VERSION=2.0.0 +MOGO_SKIN_SUPPORT_VERSION=2.0.7 +MOGO_SKIN_LIGHT_VERSION=2.0.7 +MOGO_SKIN_SUPPORT_IMPL_VERSION=2.0.7 +MOGO_SKIN_SUPPORT_NOOP_VERSION=2.0.7 +SKIN_SUPPORT_VERSION=2.0.7 +SKIN_SUPPORT_APPCOMPAT_VERSION=2.0.7 +SKIN_SUPPORT_CARDVIEW_VERSION=2.0.7 +SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.0.7 +SKIN_SUPPORT_DESIGN_VERSION=2.0.7 # 闪屏页 -MOGO_MODULE_SPLASH_VERSION=2.0.0 -MOGO_MODULE_SPLASH_NOOP_VERSION=2.0.0 +MOGO_MODULE_SPLASH_VERSION=2.0.7 +MOGO_MODULE_SPLASH_NOOP_VERSION=2.0.7 # monitor -MOGO_MODULE_MONITOR_VERSION=2.0.0 +MOGO_MODULE_MONITOR_VERSION=2.0.7 # bugly -CRASHREPORT_VERSION=2.0.0 -CRASHREPORT_BUGLY_VERSION=2.0.0 -CRASHREPORT_NOOP_VERSION=2.0.0 +CRASHREPORT_VERSION=2.0.7 +CRASHREPORT_BUGLY_VERSION=2.0.7 +CRASHREPORT_NOOP_VERSION=2.0.7 ## tts -TTS_BASE_VERSION=1.0.0 -TTS_DI_VERSION=1.0.0 -TTS_ZHI_VERSION=1.0.0 -TTS_NOOP_VERSION=1.0.0 -# 自研地图 -MAP_CUSTOM_VERSION=1.2.1.9 -MOGO_MODULES_MVISION_VERSION=1.0.0 -# httpdns -HTTPDNS_TENCENT_VERSION = 1.0.0 -HTTPDNS_BASE_VERSION = 1.0.0 -HTTPDNS_NOOP_VERSION = 1.0.0 +TTS_BASE_VERSION=2.0.7 +TTS_DI_VERSION=2.0.7 +TTS_ZHI_VERSION=2.0.7 +TTS_NOOP_VERSION=2.0.7 ######## 外部依赖引用 # 车聊聊 -CARCHATTING_VERSION=1.9.7.1 +CARCHATTING_VERSION=1.6.7-SNAPSHOT # 车聊聊接口 -CARCHATTINGPROVIDER_VERSION=1.4.1 +CARCHATTINGPROVIDER_VERSION=1.1.7 # loglib LOGLIB_VERSION = 1.0.4 From 93e81eee2e7868b41e7db6e72af99bf368f56a68 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 25 Nov 2020 16:22:35 +0800 Subject: [PATCH 4/8] remove bizcallchat.gradle --- app/build.gradle | 4 +++- app/functions/bizcallchat.gradle | 20 -------------------- 2 files changed, 3 insertions(+), 21 deletions(-) delete mode 100644 app/functions/bizcallchat.gradle diff --git a/app/build.gradle b/app/build.gradle index ed531a91d2..f7e1fb318a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -385,6 +385,9 @@ dependencies { debugImplementation rootProject.ext.dependencies.debugleakcanary releaseImplementation rootProject.ext.dependencies.releaseleakcanary + implementation rootProject.ext.dependencies.callchatprovider + implementation rootProject.ext.dependencies.callchat + implementation rootProject.ext.dependencies.mogologlib compileOnly rootProject.ext.dependencies.adasapi compileOnly rootProject.ext.dependencies.adasconfigapi @@ -430,7 +433,6 @@ dependencies { apply from: "./functions/tts.gradle" apply from: "./functions/backwidget.gradle" apply from: "./functions/mediaui.gradle" - apply from: "./functions/bizcallchat.gradle" apply from: "./functions/bizguide.gradle" // implementation group: "com.tencent.matrix", name: "matrix-android-lib", version: '0.6.6', changing: true diff --git a/app/functions/bizcallchat.gradle b/app/functions/bizcallchat.gradle deleted file mode 100644 index 5dbdac4336..0000000000 --- a/app/functions/bizcallchat.gradle +++ /dev/null @@ -1,20 +0,0 @@ -// 引导模块：部分机型暂不需要引导模块 - -project.dependencies { - bydautoImplementation rootProject.ext.dependencies.callchat - bydautoImplementation rootProject.ext.dependencies.callchatprovider - d8xxImplementation rootProject.ext.dependencies.callchat - d8xxImplementation rootProject.ext.dependencies.callchatprovider - d80xImplementation rootProject.ext.dependencies.callchat - d80xImplementation rootProject.ext.dependencies.callchatprovider - em4Implementation rootProject.ext.dependencies.callchat - em4Implementation rootProject.ext.dependencies.callchatprovider - e8xxImplementation rootProject.ext.dependencies.callchat - e8xxImplementation rootProject.ext.dependencies.callchatprovider - f8xxImplementation rootProject.ext.dependencies.callchat - f8xxImplementation rootProject.ext.dependencies.callchatprovider - f80xImplementation rootProject.ext.dependencies.callchat - f80xImplementation rootProject.ext.dependencies.callchatprovider - em3Implementation rootProject.ext.dependencies.callchat - em3Implementation rootProject.ext.dependencies.callchatprovider -} \ No newline at end of file From 33aedd3aef6af32d3c5989abe0faeeb713b6ecd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Wed, 25 Nov 2020 16:39:34 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86=E9=81=93?= =?UTF-8?q?=E8=B7=AF=E4=BA=8B=E4=BB=B6=E7=9A=84=E8=A7=A6=E5=8F=91=E7=AE=97?= =?UTF-8?q?=E6=B3=95=EF=BC=8C=E4=B8=BB=E8=A6=81=E5=88=86=E4=B8=BA=E4=BB=A5?= =?UTF-8?q?=E4=B8=8B=E6=AD=A5=E9=AA=A4=EF=BC=9A=20=E8=A7=A6=E5=8F=91?= =?UTF-8?q?=E9=81=93=E8=B7=AF=E4=BA=8B=E4=BB=B6=E7=9A=84=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=EF=BC=9A=200=E3=80=81=E9=81=93=E8=B7=AF=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E5=BF=85=E9=A1=BB=E6=9C=89=E6=9C=9D=E5=90=91=EF=BC=8C=E8=A7=92?= =?UTF-8?q?=E5=BA=A6>=3D0;=201=E3=80=81=E8=B7=9D=E7=A6=BB=E3=80=8A500=202?= =?UTF-8?q?=E3=80=81=E9=81=93=E8=B7=AF=E4=BA=8B=E4=BB=B6=E6=96=B9=E5=90=91?= =?UTF-8?q?=E4=B8=8E=E5=BD=93=E5=89=8D=E8=A1=8C=E9=A9=B6=E6=96=B9=E5=90=91?= =?UTF-8?q?=E8=A7=92=E5=BA=A6=E5=81=8F=E3=80=8A20=E5=BA=A6=E4=BB=A5?= =?UTF-8?q?=E5=86=85=203=E3=80=81=E5=BD=93=E5=89=8D=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E8=A1=8C=E9=A9=B6=E6=96=B9=E5=90=91=E4=B8=8E=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E4=B9=8B=E9=97=B4=E5=A4=B9=E8=A7=92=E3=80=8A?= =?UTF-8?q?20=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/module/v2x/alarm/V2XAlarmServer.java | 132 ++++++++++-------- .../v2x/alarm/V2XEarlyWarningServer.java | 71 ++++++---- .../v2x/listener/V2XLocationListener.java | 14 +- .../manager/impl/MoGoV2XMarkerManager.java | 4 +- .../v2x/receiver/SceneBroadcastReceiver.java | 2 +- .../v2x/scenario/impl/V2XScenarioManager.java | 2 +- .../v2x/utils/DrivingDirectionUtils.java | 50 ++++--- 7 files changed, 156 insertions(+), 119 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XAlarmServer.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XAlarmServer.java index 69f7e979a8..f0a32200d3 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XAlarmServer.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XAlarmServer.java @@ -76,78 +76,94 @@ public class V2XAlarmServer { // 检测道路事件是否需UGC问答 V2XEarlyWarningServer.roadEventUgcCheck(currentLocation); } -// Logger.w(MODULE_NAME, "V2X预警--车辆状态：" + currentLocation); -// Logger.w(MODULE_NAME, "V2X预警--车辆速度：" + currentLocation.getSpeed()); -// Logger.w(MODULE_NAME, "V2X预警--v2XRoadEventEntityList：" + GsonUtil.jsonFromObject(v2XRoadEventEntityList)); // 60(km/h) if (currentLocation != null && v2XRoadEventEntityList != null) { // 因为集合是按照距离排序后的所以这里检索出来第一个就发出警告 for (V2XRoadEventEntity v2XRoadEventEntity : v2XRoadEventEntityList) { - // 先计算当前车辆的车头朝向是否与事件方向相同，这里采用的是区间值，只要在20度上下即可使用 - // 道路事件必须有朝向，角度>=0; - //Logger.w(MODULE_NAME, - // "V2X预警--车辆与事件信息：" + - // "\n事件名称：" + markerNoveltyInfo.getNoveltyInfo().getContentData().getTitle() + - // "\n事件角度：" + markerNoveltyInfo.getLocation().getAngle() + - // "\n车头角度：" + currentLocation.getAngle() + - // "\n角度差值：" + Math.abs(currentLocation.getAngle() - markerNoveltyInfo.getLocation().getAngle())); + // 0、道路事件必须有朝向，角度>=0; if (v2XRoadEventEntity.getLocation().getAngle() >= 0) { // 计算车辆距离指定气泡的距离 MarkerLocation eventLocation = v2XRoadEventEntity.getLocation(); - - // 判断是否到达了触发距离,20 ~ 500, + // 1、判断是否到达了触发距离,20 ~ 500, if (v2XRoadEventEntity.getDistance() <= 500) { - double eventAngle = DrivingDirectionUtils.getDegreeOfCar2Poi( - currentLocation.getLongitude(), - currentLocation.getLatitude(), - eventLocation.getLon(), - eventLocation.getLat(), - (int) currentLocation.getBearing() - ); - if (0 <= eventAngle && eventAngle <= 20) { - // 判断是否已经提示过道路事件 - boolean isAlreadyAlert = false; - String lastTime = mAlertRoadEventList.get(v2XRoadEventEntity); - if (!TextUtils.isEmpty(lastTime)) { - long timeSpan = TimeUtils.getTimeSpanByNow(lastTime, TimeConstants.MIN); + // 2、道路事件方向与当前行驶方向角度偏差《20度以内 + double carBearing = currentLocation.getBearing(); + double eventBearing = eventLocation.getAngle(); + double diffAngle = DrivingDirectionUtils.getAngleDiff(carBearing, eventBearing); + if (diffAngle < 20) { + // 3、计算当前车辆行驶方向与事件位置之间夹角《20度，保证道路事件在车辆前方 + double eventAngle = DrivingDirectionUtils.getDegreeOfCar2Poi( + currentLocation.getLongitude(), + currentLocation.getLatitude(), + eventLocation.getLon(), + eventLocation.getLat(), + (int) currentLocation.getBearing() + ); + if (0 <= eventAngle && eventAngle <= 20) { + // 判断是否已经提示过道路事件 + boolean isAlreadyAlert = false; + String lastTime = mAlertRoadEventList.get(v2XRoadEventEntity); + if (!TextUtils.isEmpty(lastTime)) { + long timeSpan = TimeUtils.getTimeSpanByNow(lastTime, TimeConstants.MIN); // Logger.w(MODULE_NAME, // "V2X预警--事件ID：" + v2XRoadEventEntity.getNoveltyInfo().getInfoId() + // "\n上一次预警时间：" + lastTime + // "\n距离当前时间：" + timeSpan); - // 5分钟内不重复提醒 - if (timeSpan < 5) { - isAlreadyAlert = true; + // 5分钟内不重复提醒 + if (timeSpan < 5) { + isAlreadyAlert = true; + } } + // 进行提醒 + if (!isAlreadyAlert) { + Logger.w(MODULE_NAME, "V2X预警--车辆与事件信息：" + + "\n事件详情ID：" + v2XRoadEventEntity.getNoveltyInfo().getInfoId() + + "\n事件详情：" + GsonUtil.jsonFromObject(v2XRoadEventEntity.getNoveltyInfo()) + + "\n距离：" + v2XRoadEventEntity.getDistance() + "米" + + "\n是否已经提醒：" + isAlreadyAlert + + "\n当前车辆-经度：" + currentLocation.getLongitude() + + "\n当前车辆-经度：" + currentLocation.getLatitude() + + "\n当前车辆-角度：" + currentLocation.getBearing() + + "\n道路事件-经度：" + eventLocation.getLon() + + "\n道路事件-经度：" + eventLocation.getLat() + + "\n道路事件-角度：" + eventLocation.getAngle() + + "\n夹角角度：" + eventAngle + " 度" + ); + mAlertRoadEventList.put(v2XRoadEventEntity, TimeUtils.getNowString()); + return v2XRoadEventEntity; + } + return null; + } else { +// Logger.w(MODULE_NAME, "V2X预警--事件与车头角度夹角过大：" + +// "\n事件详情：" + v2XRoadEventEntity.getNoveltyInfo().getInfoId() + +// "\n当前车辆-经度：" + currentLocation.getLongitude() + +// "\n当前车辆-经度：" + currentLocation.getLatitude() + +// "\n当前车辆-角度：" + currentLocation.getBearing() + +// "\n道路事件-经度：" + eventLocation.getLon() + +// "\n道路事件-经度：" + eventLocation.getLat() + +// "\n道路事件-角度：" + eventLocation.getAngle() + +// "\n夹角角度：" + eventAngle + " 度" +// ); } - Logger.w(MODULE_NAME, "V2X预警--车辆与事件信息：" + - "\n距离：" + v2XRoadEventEntity.getDistance() + "米" + - "\n是否已经提醒：" + isAlreadyAlert + - "\n事件ID：" + v2XRoadEventEntity.getNoveltyInfo().getInfoId() + - "\n事件详情：" + GsonUtil.jsonFromObject(v2XRoadEventEntity.getNoveltyInfo()) - ); - // 进行提醒 - if (!isAlreadyAlert) { - mAlertRoadEventList.put(v2XRoadEventEntity, TimeUtils.getNowString()); - return v2XRoadEventEntity; - } - return null; } else { - Logger.w(MODULE_NAME, "V2X预警--事件与车头角度夹角过大：" + - "\n角度：" + eventAngle + " 度" + - "\n事件详情：" + v2XRoadEventEntity.getNoveltyInfo().getInfoId() + Logger.w(MODULE_NAME, + "V2X预警--车头方向与事件方向角度不一致：" + + "\n事件详情：" + v2XRoadEventEntity.getNoveltyInfo().getInfoId() + + "\n车头方向： " + carBearing + + "\n事件方向：" + eventBearing + + "\n角度差值：" + diffAngle ); } } else { - Logger.w(MODULE_NAME, "V2X预警--车辆距离事件距离大于500米了：" + - "\n距离：" + v2XRoadEventEntity.getDistance() + "米" + - "\n事件详情：" + v2XRoadEventEntity.getNoveltyInfo().getInfoId() - ); +// Logger.w(MODULE_NAME, "V2X预警--车辆距离事件距离大于500米了：" + +// "\n事件详情：" + v2XRoadEventEntity.getNoveltyInfo().getInfoId() + +// "\n距离：" + v2XRoadEventEntity.getDistance() + "米" +// ); } } else { - Logger.w(MODULE_NAME, - "V2X预警--车头方向与事件方向角度不一致：" + - "\n车头方向： " + currentLocation.getBearing() + - "\n事件方向：" + v2XRoadEventEntity.getLocation().getAngle() + Logger.e(MODULE_NAME, + "V2X预警--道路事件没有角度信息" + + "\n事件详情：" + v2XRoadEventEntity.getNoveltyInfo().getInfoId() ); } } @@ -189,11 +205,11 @@ public class V2XAlarmServer { switch (levelListBean.getLevel()) { //正常 case "NORMAL": - Logger.d(MODULE_NAME, "驾驶疲劳程度: 正常"); + //Logger.d(MODULE_NAME, "驾驶疲劳程度: 正常"); break; //轻度 case "SLIGHT": - Logger.w(MODULE_NAME, "驾驶疲劳程度: 轻度"); + //Logger.w(MODULE_NAME, "驾驶疲劳程度: 轻度"); if (!mV2XFatigueDrivingEventLevel.contains("SLIGHT")) { mV2XFatigueDrivingEventLevel.add("SLIGHT"); drivingShowEntity.setShowWindow(false); @@ -208,15 +224,15 @@ public class V2XAlarmServer { break; //中度 case "MODERATE": - Logger.e(MODULE_NAME, "驾驶疲劳程度: 中度"); + //Logger.e(MODULE_NAME, "驾驶疲劳程度: 中度"); warningParkPoi(location, onFatigueDrivingListener, drivingShowEntity, levelListBean); break; //重度 case "SEVERE": - Logger.e(MODULE_NAME, "驾驶疲劳程度: 重度"); + //Logger.e(MODULE_NAME, "驾驶疲劳程度: 重度"); break; default: - Logger.e(MODULE_NAME, "驾驶疲劳程度: 超出定义范围"); + //Logger.e(MODULE_NAME, "驾驶疲劳程度: 超出定义范围"); break; } } @@ -238,7 +254,7 @@ public class V2XAlarmServer { LocationUtils.geoCodeSearch(location, new IMogoGeoSearchListener() { @Override public void onRegeocodeSearched(MogoRegeocodeResult regeocodeResult) { - Logger.i(MODULE_NAME, "根据经纬度查询结果为：" + regeocodeResult.getRegeocodeAddress().getFormatAddress()); + //Logger.i(MODULE_NAME, "根据经纬度查询结果为：" + regeocodeResult.getRegeocodeAddress().getFormatAddress()); String keyword = "停车场"; boolean isHighWay = false; // 如果当前位置是高速则推荐服务区 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 80c91f14f8..94fa20a857 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 @@ -4,22 +4,18 @@ import android.content.Intent; import androidx.localbroadcastmanager.content.LocalBroadcastManager; -import com.mogo.map.MogoLatLng; import com.mogo.map.location.MogoLocation; import com.mogo.module.common.entity.MarkerLocation; import com.mogo.module.common.entity.V2XMessageEntity; import com.mogo.module.common.entity.V2XRoadEventEntity; import com.mogo.module.v2x.V2XConst; -import com.mogo.module.v2x.V2XServiceManager; import com.mogo.module.v2x.utils.DrivingDirectionUtils; import com.mogo.module.v2x.utils.EventTypeUtils; import com.mogo.module.v2x.utils.V2XUtils; -import com.mogo.service.share.IMogoTanluProvider; -import com.mogo.service.share.TanluUploadParams; import com.mogo.utils.logger.Logger; +import com.mogo.utils.network.utils.GsonUtil; import java.util.ArrayList; -import java.util.List; import java.util.Set; import static com.mogo.module.v2x.V2XConst.MODULE_NAME; @@ -30,7 +26,7 @@ import static com.mogo.module.v2x.V2XConst.MODULE_NAME; public class V2XEarlyWarningServer { private static final String TAG = "V2XEarlyWarningServer"; - private static List alertMessageId = new ArrayList<>(); + private static ArrayList alertMessageId = new ArrayList<>(); /** * 对提醒过的道路事件进行UGC检测 @@ -54,37 +50,50 @@ public class V2XEarlyWarningServer { (int) currentLocation.getBearing() ); - // 判断车辆行驶角度是否与事件相反，相反的话表示已经行驶过去了 - if (90 <= eventAngle && !alertMessageId.contains(v2XRoadEventEntity.getNoveltyInfo().getInfoId())) { - // 封路、施工、拥堵、拥堵 才会有UGC提示 - if (EventTypeUtils.isNeedRoadEventUgc(v2XRoadEventEntity.getPoiType())) { + double carBearing = currentLocation.getBearing(); + String roadInfoId = v2XRoadEventEntity.getNoveltyInfo().getInfoId(); - Logger.w(MODULE_NAME + "_" + TAG, "V2X预警UGC--事件与车头角度夹角过大：" + - "\n角度：" + eventAngle + " 度" + - "\n事件详情：" + v2XRoadEventEntity.getNoveltyInfo().getInfoId() + - "\n库存事件：" + V2XAlarmServer.mAlertRoadEventList.size() - ); + Logger.w(MODULE_NAME, + "V2X预警--UGC检测：" + + "\n事件详情：" + roadInfoId + + "\n车头方向： " + carBearing + + "\n车与事件夹角：" + eventAngle + + "\n已经UGC的事件：" + GsonUtil.jsonFromObject(alertMessageId) + ); - // 记录已经 UGC 提醒过的数据 - alertMessageId.add(v2XRoadEventEntity.getNoveltyInfo().getInfoId()); + // 判断是否预警过了 + if (!alertMessageId.contains(roadInfoId)) { + // 判断车辆行驶角度是否与事件相反，相反的话表示已经行驶过去了 + if (80 <= eventAngle) { + // 封路、施工、拥堵、拥堵 才会有UGC提示 + if (EventTypeUtils.isNeedRoadEventUgc(v2XRoadEventEntity.getPoiType())) { + Logger.w(MODULE_NAME + "_" + TAG, "V2X预警UGC--事件与车头角度夹角过大：" + + "\n角度：" + eventAngle + " 度" + + "\n事件详情：" + roadInfoId + + "\n库存事件：" + V2XAlarmServer.mAlertRoadEventList.size() + ); - // 加载数据源 - V2XMessageEntity v2xMessageEntity = new V2XMessageEntity<>(); - // 控制类型 - v2xMessageEntity.setType(V2XMessageEntity.V2XTypeEnum.ALERT_EVENT_UGC_WARNING); - // 设置数据 - v2xMessageEntity.setContent(v2XRoadEventEntity); - // 控制展示状态 - v2xMessageEntity.setShowState(true); - // 弹出UGC - Intent intent = new Intent(V2XConst.BROADCAST_SCENE_HANDLER_ACTION); - intent.putExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY, v2xMessageEntity); - LocalBroadcastManager.getInstance(V2XUtils.getApp()).sendBroadcast(intent); + // 记录已经 UGC 提醒过的数据 + alertMessageId.add(roadInfoId); + // 加载数据源 + V2XMessageEntity v2xMessageEntity = new V2XMessageEntity<>(); + // 控制类型 + v2xMessageEntity.setType(V2XMessageEntity.V2XTypeEnum.ALERT_EVENT_UGC_WARNING); + // 设置数据 + v2xMessageEntity.setContent(v2XRoadEventEntity); + // 控制展示状态 + v2xMessageEntity.setShowState(true); + // 弹出UGC + Intent intent = new Intent(V2XConst.BROADCAST_SCENE_HANDLER_ACTION); + intent.putExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY, v2xMessageEntity); + LocalBroadcastManager.getInstance(V2XUtils.getApp()).sendBroadcast(intent); + + } + // 移出已经预警的事件列表 + //V2XAlarmServer.mAlertRoadEventList.remove(v2XRoadEventEntity); } - // 移出已经预警的事件列表 - //V2XAlarmServer.mAlertRoadEventList.remove(v2XRoadEventEntity); } } } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XLocationListener.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XLocationListener.java index 584671293c..b5104f1925 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XLocationListener.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XLocationListener.java @@ -154,11 +154,11 @@ public class V2XLocationListener implements IMogoLocationListener, CarStatusList V2XServiceManager.getV2XStatusManager().getLocation()); // 距离是否大于10米 && 消息是否不为空 if (v2XRoadEventEntity != null && v2XRoadEventEntity.getDistance() >= 5) { - Logger.w(MODULE_NAME, - //"\nV2X预警--当前导航状态:" + V2XServiceManager.getNavi().isNaviing() + - //"\nV2X预警--roadEventIsNullCount:" + roadEventIsNullCount + - "\nV2X预警--当前预警事件:" + v2XRoadEventEntity - ); +// Logger.w(MODULE_NAME, +// //"\nV2X预警--当前导航状态:" + V2XServiceManager.getNavi().isNaviing() + +// //"\nV2X预警--roadEventIsNullCount:" + roadEventIsNullCount + +// "\nV2X预警--当前预警事件:" + v2XRoadEventEntity +// ); // Logger.w(MODULE_NAME, "V2X预警--前方数据距离:" + v2XRoadEventEntity.getDistance()); // 触发展示操作 TrackUtils.trackV2xRoadProduceEvent(1); @@ -229,7 +229,7 @@ public class V2XLocationListener implements IMogoLocationListener, CarStatusList LocationUtils.geoCodeSearch(location, new IMogoGeoSearchListener() { @Override public void onRegeocodeSearched(MogoRegeocodeResult regeocodeResult) { - Logger.i(MODULE_NAME, " 根据经纬度查询结果为：" + regeocodeResult.getRegeocodeAddress().getFormatAddress()); + //Logger.i(MODULE_NAME, " 根据经纬度查询结果为：" + regeocodeResult.getRegeocodeAddress().getFormatAddress()); location.setAddress(regeocodeResult.getRegeocodeAddress().getFormatAddress()); // 如果有 "高速"、"环线"、"快速路"等字眼的，视为封闭式道路，流程结束； if (regeocodeResult.getRegeocodeAddress().getFormatAddress().contains("高速") @@ -257,7 +257,7 @@ public class V2XLocationListener implements IMogoLocationListener, CarStatusList .queryIllegalPark(new V2XRefreshCallback() { @Override public void onSuccess(MarkerResponse result) { - Logger.i(MODULE_NAME, "搜索附近的违章停车点 成功：" + GsonUtil.jsonFromObject(result)); + //Logger.i(MODULE_NAME, "搜索附近的违章停车点 成功：" + GsonUtil.jsonFromObject(result)); if (result != null) { if (result.getResult().getExploreWay().size() > 0) { V2XMessageEntity> entity = new V2XMessageEntity<>(); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java index de02286a2b..c7a66a11af 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java @@ -60,7 +60,7 @@ public class MoGoV2XMarkerManager implements IMoGoV2XMarkerManager { @Override public void drawableLastAllPOI() { - Logger.w(MODULE_NAME, "V2X---绘制上一次的POI，回调给Launcher底层逻辑让其进行绘制"); + //Logger.w(MODULE_NAME, "V2X---绘制上一次的POI，回调给Launcher底层逻辑让其进行绘制"); // 清除连接线 V2XServiceManager.getMoGoV2XPolylineManager().clearLine(); clearAlarmPOI(); @@ -521,7 +521,7 @@ public class MoGoV2XMarkerManager implements IMoGoV2XMarkerManager { try { V2XServiceManager.getMapUIController().changeMapMode(EnumMapUI.NorthUP_2D); V2XServiceManager.getMoGoV2XStatusManager().setRoadEventPOIShow(TAG, true); - Logger.i(MODULE_NAME, "绘制道路事件====drawableAlarmPOI："); + //Logger.i(MODULE_NAME, "绘制道路事件====drawableAlarmPOI："); // 清除原来的大而全的新鲜事儿 clearALLPOI(); if (roadEventEntity.getLocation() != null) { diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/receiver/SceneBroadcastReceiver.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/receiver/SceneBroadcastReceiver.java index 40ec88c69b..dd3773819e 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/receiver/SceneBroadcastReceiver.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/receiver/SceneBroadcastReceiver.java @@ -23,7 +23,7 @@ public class SceneBroadcastReceiver extends BroadcastReceiver { public void onReceive(Context context, Intent intent) { try { V2XMessageEntity v2XMessageEntity = (V2XMessageEntity) intent.getSerializableExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY); - Logger.d(TAG, "v2XMessageEntity:" + GsonUtil.jsonFromObject(v2XMessageEntity)); + //Logger.d(TAG, "v2XMessageEntity:" + GsonUtil.jsonFromObject(v2XMessageEntity)); V2XScenarioManager.getInstance().handlerMessage(v2XMessageEntity); } catch (Exception e) { e.printStackTrace(); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java index 86f303b9a6..a81d3afe76 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java @@ -55,7 +55,7 @@ public class V2XScenarioManager implements IV2XScenarioManager { @Override public void handlerMessage(V2XMessageEntity v2XMessageEntity) { - Logger.d(MODULE_NAME, "处理V2X场景：" + GsonUtil.jsonFromObject(v2XMessageEntity)); + //Logger.d(MODULE_NAME, "处理V2X场景：" + GsonUtil.jsonFromObject(v2XMessageEntity)); synchronized (V2XScenarioManager.class) { // 展示 V2XUtils.runOnUiThread(() -> { diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/DrivingDirectionUtils.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/DrivingDirectionUtils.java index f045b6d0c1..bd48e3f2ff 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/DrivingDirectionUtils.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/DrivingDirectionUtils.java @@ -1,5 +1,7 @@ package com.mogo.module.v2x.utils; +import static java.lang.Math.PI; + /** * author : donghongyu * e-mail : 1358506549@qq.com @@ -22,8 +24,8 @@ public class DrivingDirectionUtils { public static int getDegreeOfCar2Poi(double carLon, double carLat, double poiLon, double poiLat, int carAngle) { int poiAngle = 0; // 以子午线作为y轴 计算两点的余切 再将余切值转化为角度 - double _angle = Math.atan2(Math.abs(carLon - poiLon), Math.abs(carLat - poiLat)) * (180 / Math.PI); - + double _angle = Math.atan2(Math.abs(carLon - poiLon), Math.abs(carLat - poiLat)) * (180 / PI); + //Log.w(MODULE_NAME, "getDegreeOfCar2Poi_计算车辆行驶方向 与 poi点到车辆的连线 间的夹角_angle===" + _angle); if (poiLon > carLon) { // poi 在 车辆位置的第1象限 if (poiLat > carLat) { @@ -46,9 +48,27 @@ public class DrivingDirectionUtils { return calculationAngle(poiAngle, carAngle); } + /** + * 计算两个行驶方向间的夹角 计算结果小于180度 + * + * @param angle0 + * @param angle1 + * @return + */ + public static int calculationAngle(int angle0, int angle1) { + // 获取两方向间夹角 + int angle = Math.abs(angle0 - angle1); + if (angle > 180) { + int minAngle = Math.min(angle0, angle1); + int maxAngle = Math.max(angle0, angle1); + return 180 - Math.abs(minAngle + 180 - maxAngle); + } else { + return angle; + } + } /** - * 计算车辆行驶方向 与 poi点到车辆的连线 间的夹角 + * 计算车辆行驶方向角度，起点&终点经纬度 * * @param carLat 车辆位置 lat * @param carLon 车辆位置 lon @@ -58,7 +78,7 @@ public class DrivingDirectionUtils { public static int getCarAngle(double carLat, double carLon, double poiLat, double poiLon) { int poiAngle = 0; // 以子午线作为y轴 计算两点的余切 再将余切值转化为角度 - double _angle = Math.atan2(Math.abs(carLon - poiLon), Math.abs(carLat - poiLat)) * (180 / Math.PI); + double _angle = Math.atan2(Math.abs(carLon - poiLon), Math.abs(carLat - poiLat)) * (180 / PI); if (poiLon > carLon) { // poi 在 车辆位置的第1象限 @@ -87,23 +107,15 @@ public class DrivingDirectionUtils { } /** - * 计算两个行驶方向间的夹角 计算结果小于180度 + * 计算连两个角度差值 * - * @param angle0 - * @param angle1 - * @return + * @param angle1 角度1 + * @param angle2 角度2 + * @return 差值 */ - public static int calculationAngle(int angle0, int angle1) { - // 获取两方向间夹角 - int angle = Math.abs(angle0 - angle1); - if (angle > 180) { - int minAngle = Math.min(angle0, angle1); - int maxAngle = Math.max(angle0, angle1); - return 180 - Math.abs(minAngle + 180 - maxAngle); - } else { - return angle; - } + public static double getAngleDiff(double angle1, double angle2) { + // 两个角度差值较小 + return 180 - Math.abs(Math.abs(angle1 - angle2) - 180); } - } From 9ece7af5acd965c86d0d3a424cdafa0784bfe6f8 Mon Sep 17 00:00:00 2001 From: liujing Date: Wed, 25 Nov 2020 16:50:52 +0800 Subject: [PATCH 6/8] =?UTF-8?q?[UI]=20=E8=BD=A6=E5=8F=8B=E5=88=97=E8=A1=A8?= =?UTF-8?q?-F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/values-xhdpi/dimens.xml | 8 ++++---- .../onlinecar/panel/OnlineCarPanelAdapter.java | 2 +- .../module_services_panel_item_bkg.xml | 4 ++-- ...dule_services_fragment_online_car_panel.xml | 2 +- .../module_services_online_car_panel_item.xml | 7 ++++--- .../src/main/res/values-ldpi/dimens.xml | 3 ++- .../src/main/res/values-mdpi/dimens.xml | 3 ++- .../main/res/values-xhdpi-1920x1000/dimens.xml | 4 ++-- .../src/main/res/values-xhdpi/dimens.xml | 18 +++++++++--------- .../src/main/res/values/dimens.xml | 4 +++- .../src/main/res/values/strings.xml | 2 +- .../module_services_panel_item_bkg_light.xml | 2 +- 12 files changed, 32 insertions(+), 27 deletions(-) diff --git a/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml index 1e3dc1ca7d..0f5abc133c 100644 --- a/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml @@ -28,8 +28,8 @@ 20px 20px - 18px - 18px - 18px - 18px + 15px + 15px + 15px + 15px \ No newline at end of file diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelAdapter.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelAdapter.java index de632983fd..86beee061c 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelAdapter.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelAdapter.java @@ -129,7 +129,7 @@ class OnlineCarPanelAdapter extends RecyclerView.Adapter= 1000) { - return String.format("%.1f千米", distance / 1000); + return String.format("%.1f公里", distance / 1000); } else { return String.format("%.1f米", distance); } diff --git a/modules/mogo-module-service/src/main/res/drawable/module_services_panel_item_bkg.xml b/modules/mogo-module-service/src/main/res/drawable/module_services_panel_item_bkg.xml index 08e5f85a0a..e694f85e35 100644 --- a/modules/mogo-module-service/src/main/res/drawable/module_services_panel_item_bkg.xml +++ b/modules/mogo-module-service/src/main/res/drawable/module_services_panel_item_bkg.xml @@ -2,8 +2,8 @@ - - + + \ No newline at end of file diff --git a/modules/mogo-module-service/src/main/res/layout/module_services_fragment_online_car_panel.xml b/modules/mogo-module-service/src/main/res/layout/module_services_fragment_online_car_panel.xml index 2b4ceea7d2..1a5729e252 100644 --- a/modules/mogo-module-service/src/main/res/layout/module_services_fragment_online_car_panel.xml +++ b/modules/mogo-module-service/src/main/res/layout/module_services_fragment_online_car_panel.xml @@ -16,7 +16,7 @@ android:id="@+id/module_services_id_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/module_services_online_car_panel_close_margin_top" + android:layout_marginTop="@dimen/module_services_online_car_panel_title_margin_top" android:textStyle="bold" android:text="@string/module_services_online_car_panel_title" android:textColor="@color/module_services_online_car_panel_title_textColor" diff --git a/modules/mogo-module-service/src/main/res/layout/module_services_online_car_panel_item.xml b/modules/mogo-module-service/src/main/res/layout/module_services_online_car_panel_item.xml index 577b0ba7d3..e11c589602 100644 --- a/modules/mogo-module-service/src/main/res/layout/module_services_online_car_panel_item.xml +++ b/modules/mogo-module-service/src/main/res/layout/module_services_online_car_panel_item.xml @@ -6,13 +6,14 @@ android:layout_height="wrap_content" android:layout_marginBottom="@dimen/module_services_panel_item_marginBottom" android:background="@drawable/module_services_panel_item_bkg" - android:padding="@dimen/module_services_panel_item_padding"> + android:paddingTop="@dimen/module_services_panel_item_padding" + android:paddingStart="@dimen/module_services_panel_item_start" + android:paddingBottom="@dimen/module_services_panel_item_padding"> diff --git a/modules/mogo-module-service/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-service/src/main/res/values-ldpi/dimens.xml index 8fb8c16e93..4103d9c547 100644 --- a/modules/mogo-module-service/src/main/res/values-ldpi/dimens.xml +++ b/modules/mogo-module-service/src/main/res/values-ldpi/dimens.xml @@ -48,7 +48,7 @@ 5px 20px 13px - 42px + 10px 8.89px 13px 16px @@ -62,4 +62,5 @@ 12.5px 3px 3px + 20px \ No newline at end of file diff --git a/modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml index aa8cf42951..6feb909906 100644 --- a/modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml @@ -47,7 +47,7 @@ 5px 28px 13px - 42px + 10px 8.89px 13px 16px @@ -61,4 +61,5 @@ 12.5px 3px 3px + 20px \ No newline at end of file diff --git a/modules/mogo-module-service/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-service/src/main/res/values-xhdpi-1920x1000/dimens.xml index 9f26351058..fb1ea406df 100644 --- a/modules/mogo-module-service/src/main/res/values-xhdpi-1920x1000/dimens.xml +++ b/modules/mogo-module-service/src/main/res/values-xhdpi-1920x1000/dimens.xml @@ -34,7 +34,7 @@ 50px 28px - 36px + 55px 50px 36px 151px @@ -46,7 +46,7 @@ 9px 40px 20px - 70px + 20px 16px 21px 28px diff --git a/modules/mogo-module-service/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-service/src/main/res/values-xhdpi/dimens.xml index 1881b587f6..316b89ce91 100644 --- a/modules/mogo-module-service/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-service/src/main/res/values-xhdpi/dimens.xml @@ -23,19 +23,18 @@ 120px 20px - 20px - 20px - 20px - 50px + 13px + 13px + 13px + 43px 28px - 98px 46px 40px - 36px - 50px + 40px + 55px 36px 151px 33px @@ -46,7 +45,7 @@ 9px 40px 20px - 70px + 20px 16px 21px 28px @@ -60,4 +59,5 @@ 22.5px 6px 6px - \ No newline at end of file + 40px + diff --git a/modules/mogo-module-service/src/main/res/values/dimens.xml b/modules/mogo-module-service/src/main/res/values/dimens.xml index df03037594..d5bbe4d08b 100644 --- a/modules/mogo-module-service/src/main/res/values/dimens.xml +++ b/modules/mogo-module-service/src/main/res/values/dimens.xml @@ -46,7 +46,7 @@ 5px 20px 13px - 42px + 10px 8.89px 13px 16px @@ -60,4 +60,6 @@ 12.5px 3px 3px + 24px +¬ \ No newline at end of file diff --git a/modules/mogo-module-service/src/main/res/values/strings.xml b/modules/mogo-module-service/src/main/res/values/strings.xml index 46bb81ce90..8d73bcbd45 100644 --- a/modules/mogo-module-service/src/main/res/values/strings.xml +++ b/modules/mogo-module-service/src/main/res/values/strings.xml @@ -6,7 +6,7 @@ 亲，建议您使用蘑菇出行 扩大到20公里半径 扩大到40公里半径 - 距离导航目的地 + 距离目的地 查看车友信息 电话 很抱歉，目的地%d公里内未找到车友 diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable/module_services_panel_item_bkg_light.xml b/skin/mogo-skin-light/src/main/module-services-res/drawable/module_services_panel_item_bkg_light.xml index d126dfc22a..c9cb66b911 100644 --- a/skin/mogo-skin-light/src/main/module-services-res/drawable/module_services_panel_item_bkg_light.xml +++ b/skin/mogo-skin-light/src/main/module-services-res/drawable/module_services_panel_item_bkg_light.xml @@ -2,7 +2,7 @@ - + From eb74ce01b197c2b0e516dc153496ba866fc67d67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Wed, 25 Nov 2020 16:57:18 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E8=B0=83=E6=95=B4UGC=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v2x/alarm/V2XEarlyWarningServer.java | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) 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 94fa20a857..db5b7cabcf 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 @@ -53,21 +53,20 @@ public class V2XEarlyWarningServer { double carBearing = currentLocation.getBearing(); String roadInfoId = v2XRoadEventEntity.getNoveltyInfo().getInfoId(); - Logger.w(MODULE_NAME, - "V2X预警--UGC检测：" + - "\n事件详情：" + roadInfoId + - "\n车头方向： " + carBearing + - "\n车与事件夹角：" + eventAngle + - "\n已经UGC的事件：" + GsonUtil.jsonFromObject(alertMessageId) - ); - - // 判断是否预警过了 - if (!alertMessageId.contains(roadInfoId)) { - // 判断车辆行驶角度是否与事件相反，相反的话表示已经行驶过去了 - if (80 <= eventAngle) { - // 封路、施工、拥堵、拥堵 才会有UGC提示 - if (EventTypeUtils.isNeedRoadEventUgc(v2XRoadEventEntity.getPoiType())) { - + // 封路、施工、拥堵、拥堵 才会有UGC提示 + if (EventTypeUtils.isNeedRoadEventUgc(v2XRoadEventEntity.getPoiType())) { + Logger.w(MODULE_NAME, + "V2X预警--UGC检测：" + + "\n事件详情：" + roadInfoId + + "\n事件详情：" + EventTypeUtils.getPoiTypeStr(v2XRoadEventEntity.getPoiType()) + + "\n车头方向： " + carBearing + + "\n车与事件夹角：" + eventAngle + + "\n已经UGC的事件：" + GsonUtil.jsonFromObject(alertMessageId) + ); + // 判断是否预警过了 + if (!alertMessageId.contains(roadInfoId)) { + // 判断车辆行驶角度是否与事件相反，相反的话表示已经行驶过去了 + if (80 <= eventAngle) { Logger.w(MODULE_NAME + "_" + TAG, "V2X预警UGC--事件与车头角度夹角过大：" + "\n角度：" + eventAngle + " 度" + "\n事件详情：" + roadInfoId + From d0f7c54c04350226c529b188344736f690450953 Mon Sep 17 00:00:00 2001 From: liujing Date: Wed, 25 Nov 2020 17:03:44 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E9=9D=A2=E6=9D=BF?= =?UTF-8?q?=E5=B1=85=E5=B7=A6=E5=BE=AE=E8=B0=83-M?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/mogo-module-main/src/main/res/values/dimens.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mogo-module-main/src/main/res/values/dimens.xml b/modules/mogo-module-main/src/main/res/values/dimens.xml index 30f61f1985..89a3dc55f4 100644 --- a/modules/mogo-module-main/src/main/res/values/dimens.xml +++ b/modules/mogo-module-main/src/main/res/values/dimens.xml @@ -33,6 +33,6 @@ 2px 2px - 0px + 6px 6px \ No newline at end of file