From c9020f159ee412ee152f802af28234fe3b8f2ddc Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Mon, 7 Sep 2020 15:03:58 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0leakcanery?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/launcher/MogoApplication.java | 14 ++++++++++++++ .../java/com/mogo/commons/AbsMogoApplication.java | 8 +++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index 32e9f221e8..5d49b003e5 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -32,6 +32,7 @@ import com.mogo.service.passport.IMogoTicketCallback; import com.mogo.utils.UiThreadHandler; import com.mogo.utils.logger.LogLevel; import com.mogo.utils.logger.Logger; +import com.squareup.leakcanary.LeakCanary; import com.zhidao.boot.persistent.lib.PersistentManager; import com.zhidao.mogo.module.left.panel.LeftPanelConst; import com.zhidao.mogo.tanlu.api.TanluApiConst; @@ -53,6 +54,9 @@ public class MogoApplication extends AbsMogoApplication { public void onCreate() { initDebugConfig(); super.onCreate(); + if ( !shouldInit() ) { + return; + } // Crash 日志收集 final long start = System.currentTimeMillis(); CrashSystem crashSystem = CrashSystem.getInstance( this ); @@ -94,10 +98,20 @@ public class MogoApplication extends AbsMogoApplication { Intent intent = new Intent( this, MogoMainService.class ); startService( intent ); } + + LeakCanary.install( this ); Log.i( "timer", "cost " + ( System.currentTimeMillis() - start ) + "ms" ); } + @Override + protected boolean shouldInit() { + return !LeakCanary.isInAnalyzerProcess( this ); + } + private void initDebugConfig() { + if ( !shouldInit() ) { + return; + } DebugConfig.setNetMode( BuildConfig.NET_ENV ); DebugConfig.setDebug( BuildConfig.DEBUG ); DebugConfig.setAIType( BuildConfig.AIType ); diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java index 3acc039d7e..fa21e41563 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java @@ -53,7 +53,13 @@ public class AbsMogoApplication extends Application { public void onCreate() { super.onCreate(); sApp = this; - init(); + if ( shouldInit() ) { + init(); + } + } + + protected boolean shouldInit(){ + return true; } protected void init() { From 8b1aca97c49808294aee9d0c4c8bd0fb608b21df Mon Sep 17 00:00:00 2001 From: liujing Date: Tue, 8 Sep 2020 14:02:21 +0800 Subject: [PATCH 2/7] =?UTF-8?q?[rm]=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E6=96=87=E4=BB=B6=20=20+=E6=8C=89=E9=92=AE=E9=98=B4=E5=BD=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drawable-ldpi/icon_event_panel_more.png | Bin 280 -> 995 bytes .../drawable-mdpi/icon_event_panel_more.png | Bin 0 -> 280 bytes .../drawable-xhdpi/icon_event_panel_more.png | Bin 643 -> 1248 bytes .../drawable/v2x_drawable_event_more_bkg.xml | 8 -------- ...le_v2x_event_panel_fragment_event_panel.xml | 10 +++++----- .../layout/view_event_panel_history_count.xml | 10 +++++----- .../src/main/res/values-mdpi/dimens.xml | 4 +++- .../main/res/values-xhdpi-1920x1000/dimens.xml | 1 + .../src/main/res/values-xhdpi/dimens.xml | 6 ++++-- .../src/main/res/values/dimens.xml | 3 ++- .../v2x_drawable_event_more_bkg_light.xml | 8 -------- .../module-v2x-res/values-xhdpi/dimens.xml | 2 -- .../src/main/module-v2x-res/values/dimens.xml | 1 - 13 files changed, 20 insertions(+), 33 deletions(-) create mode 100644 modules/mogo-module-v2x/src/main/res/drawable-mdpi/icon_event_panel_more.png delete mode 100644 modules/mogo-module-v2x/src/main/res/drawable/v2x_drawable_event_more_bkg.xml delete mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_drawable_event_more_bkg_light.xml diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_event_panel_more.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_event_panel_more.png index ab63bcf60e320a73f8fcc8db332c979a7750b944..c3372edaf260ae73431ff081ecc342c26d60ff90 100644 GIT binary patch literal 995 zcmeAS@N?(olHy`uVBq!ia0vp^mLSZ*1|)kVnp=SsV{wqX6T`Z5GB1IgmedH(G+$o^ zEg+kNft68+ff=L(2pJfq7+Aq<1_m!iX*fHGQ3I-miGiU#lYs@QCJIP{fCmr*bwg?9 z1&jz27cjw9TP|QmutC~fRzF`1q&N#aB8wRqxP?KOkzv*x37~0_nIRD+5xzcF$@#f@ zi7EL>sd^Q;1t47vHWgMtW^QUpqC!P(PF}H9g{=};g%ywu64qBz04piUwpEJo4N!2- zFG^J~)icpEP_pAvP*AWbN=dT{a&d!d2l8x{GD=Dctn~HE%ggo3jrH=2()A53EiLs8 zjP#9+bb%^#i!1X=5-W7`ij^UTz|3(;Elw`VEGWs$&r<-Io0ybeT4JlD1hNPYAnq*5 zOhed|R}A$Q(1ZFQ8GS=N1AVyJK&>_)Q7iwV%v7MwAoJ}EZNMr~#Gv-r=z}araty?$ zU{Rn~?YM08;lXCd<#R|q5*WynJzX3_GFabE-|NNfDAKw)Nj)-WQ*IZ&3)Ha7 zAN0~S;h&^7wfFtPgvnY{o4T5Abu20V94ipiYMJ6ucEGs6BjMfsn)2y;FK1QGY~Y-M zghZSd1Zk~&UB$dRc}t&)ylP&XZ|{5SU29jp(p5fpW2*DF3j$NOESh(3$ElP5m#h=B=CL^EPF6!tV@jPdl$qJhLm*;{)dV z)ukWVxEf~VfqDf6U;Q)d*bi8^S9{2^rk{L2{Q>ip#7C7LszLmf?h6iwY+(EL-ttMH z*7{phw}vce`?hqK*wIJlHtcruUi8=IOr1y3LX{x->o0zoMY&GupJa1bEl*MY#mwWT z_x$yR4H&_wQIpd{zKrdQ1e;l4=HUaYjd)fh-{oX~vq0jtiouPuMMsYaC&%9D$qVXS z()99)a${N0L8%+{ize@0x#yLx%CjRv(?h2J+A*)_kax(fr9W4>d|G#s#peJ5EmJjM YYIt({_$22qH$W-f)78&qol`;+0E|#eX8-^I literal 280 zcmV+z0q6dSP)Q-}7uT|7DmEqR@|p z`a&3UPbP>3F_(a=uPXm)95m>|n!Q5P=JAQr@2 e0Q-}7uT|7DmEqR@|p z`a&3UPbP>3F_(a=uPXm)95m>|n!Q5P=JAQr@2 e0L?%0y#=eD>ycCdc2C@@O&(uq0RM5U%=NXV8VnM z3YtpG1e&cjeUTA3xwm}A=Cp`&mF9PzZAv@4`(FC9IeQb&-fUZ^DYHRyRe&JJ6P0cU z1=b=Vb~R0B>mUX7!h}giTa;-aaHuRr^J&%ty$7lf1Rt0MFn_7P=E-=DX+BeXLvY$R z_ajkVES2&FB0J(4w!1ub*v~l6aC83lo^>1@EI;)�zN0{8vAcC}+AkeYJazkOb$a zGmjpdI9=cM#3DOwySs=q=O^n2eH?+=Qyy0v?>1g^&tn36BeUS5YZ}L+)4mnC?477k z&Tzbey)j$qi0_=orF9m5EF< zrTq6=G_LusRl3As*|A`KKZVzOy<{~fto(STTbLZ>ZH+ohE7nOj+8%JWGAeL=cUqY_ zp6TEB%`<=g58J2Yc#mffuMK0&_D!313jblN;nN889?!_|z0A+g=A_sDI5u&j!e8V2`{hfo zT7Q^0(>7Axj_nEa0riIYdR);8g05<39+t1Ft9ol_{M*VYe#XP4BKuF?+Fi34ppe@+}weK37Ry2pG?kte54dvVSJ23*?f zB3_XbF*dWVa-?i7-O0w4q9=DYi)GWzT`|n8M&kWxrc5_;V%Ie?&FpsHEY+B^P4Bux zGH(wQMrmjA|=;x{PwKm_^KU;mFby7CJ$;yxKcBX#5YJEWb<*fByn*Vlj zwDJcqdP(Q?mLU=4rM0gDOrs&FUyYaWZATMr*bg&6OZlI=Ts-io|T;$ zrQp8nZlPY|n~ZlSt}t0%dfQjbnc`mTzD(@I#Juu3-U`;Utc|uh^p)&>9K&?;;+=^r lS&Nq3mVGWnycNInCvDkK{9Dqq8(4BNc)I$ztaD0e0sxv4F}?r* literal 643 zcmeAS@N?(olHy`uVBq!ia0vp^J|N7&1|*M957cI0VDj>GaSW-5dwct!S7@Th(T`g> zxHN@?q&R$)JXqxyEXZW_o%KaP?Chd;jyaunEls8!89FzZSt14en%Ep2C$>1f`Efw* z!T-h&b59rTId}8-zju!gSbooV%FijWR5rg~S&neE)Z&9$@NTxZ^<^>XQw*C`hoZXPbn-1v9io3?|u zPOg46XNmMAy@`p;srBB!a(?UIUCG_UH*;ytfd|_qH#9ghO86gUVq;CP;pLVPY4~WO zlMujg>@ry5IMDXbljeEuvi>;x{kJ2fcfWBOzGl2V;Y$mTq{Z&U-Vu6l1dU^JH&HayWHt)Uf*9UZT>TkoF>z5~rtJvEA zJ>CW~t1hiN@%Im(gC|a=8+J>Zb#pv1X6?y%>MpQCbVEZSV};8){IU0s|B+3a@0RT$ Rn!v=x;OXk;vd$@?2>=#B9V!3- diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_drawable_event_more_bkg.xml b/modules/mogo-module-v2x/src/main/res/drawable/v2x_drawable_event_more_bkg.xml deleted file mode 100644 index e4ec12dbe4..0000000000 --- a/modules/mogo-module-v2x/src/main/res/drawable/v2x_drawable_event_more_bkg.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml index f12d64563b..a8a16214d7 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml @@ -89,10 +89,10 @@ app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="@+id/rgTabSelect" /> - - - - - + + + + + diff --git a/modules/mogo-module-v2x/src/main/res/layout/view_event_panel_history_count.xml b/modules/mogo-module-v2x/src/main/res/layout/view_event_panel_history_count.xml index 7535edfbae..70a8bdcd36 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/view_event_panel_history_count.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/view_event_panel_history_count.xml @@ -5,15 +5,15 @@ android:id="@+id/llEventMore" android:layout_width="@dimen/module_v2x_panel_width" android:layout_height="@dimen/module_v2x_panel_width" - android:background="@drawable/v2x_drawable_event_more_bkg" + android:background="@drawable/v2x_shadow_bg" + android:translationY="@dimen/v2x_panel_btn_translationY" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - tools:translationZ="1dp"> + app:layout_constraintTop_toTopOf="parent"> diff --git a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml index c6fadac6c2..65c5c57c95 100644 --- a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml @@ -57,7 +57,7 @@ 16px 17px 15.4px - 66px + 74px 16px 117px 200px @@ -73,5 +73,7 @@ 15px 29px -8px + 57px + diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml index a32a64e53a..9c31211f00 100644 --- a/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml @@ -56,5 +56,6 @@ 42px 16px 120px + 114px diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml index 0939e17d89..30bd6a2d2c 100644 --- a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml @@ -56,7 +56,7 @@ 31.9px 26px 30px - 120px + 136px 219px 400px 281px @@ -71,5 +71,7 @@ 36px 54px -10px - + 114px + + diff --git a/modules/mogo-module-v2x/src/main/res/values/dimens.xml b/modules/mogo-module-v2x/src/main/res/values/dimens.xml index 7685508ab7..41926f091f 100644 --- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml @@ -57,7 +57,7 @@ 16px 16px 20px - 66px + 74px 16px 117px 200px @@ -73,6 +73,7 @@ 15px 29px -8px + 38px diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_drawable_event_more_bkg_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_drawable_event_more_bkg_light.xml deleted file mode 100644 index 14f3f0a514..0000000000 --- a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_drawable_event_more_bkg_light.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/values-xhdpi/dimens.xml b/skin/mogo-skin-light/src/main/module-v2x-res/values-xhdpi/dimens.xml index 5e7f253323..10308d87da 100644 --- a/skin/mogo-skin-light/src/main/module-v2x-res/values-xhdpi/dimens.xml +++ b/skin/mogo-skin-light/src/main/module-v2x-res/values-xhdpi/dimens.xml @@ -1,7 +1,5 @@ - - 30px 42px diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/values/dimens.xml b/skin/mogo-skin-light/src/main/module-v2x-res/values/dimens.xml index 9266d3c6f7..311b8d6151 100644 --- a/skin/mogo-skin-light/src/main/module-v2x-res/values/dimens.xml +++ b/skin/mogo-skin-light/src/main/module-v2x-res/values/dimens.xml @@ -1,6 +1,5 @@ - 16px 24px From 042beb61d554cd9583b02f0f06f6d27524f2a0b7 Mon Sep 17 00:00:00 2001 From: liujing Date: Tue, 8 Sep 2020 14:11:36 +0800 Subject: [PATCH 3/7] no message --- .../src/main/module-v2x-res/values-xhdpi/dimens.xml | 2 -- skin/mogo-skin-light/src/main/module-v2x-res/values/dimens.xml | 1 - 2 files changed, 3 deletions(-) diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/values-xhdpi/dimens.xml b/skin/mogo-skin-light/src/main/module-v2x-res/values-xhdpi/dimens.xml index 10308d87da..618f4f8ca5 100644 --- a/skin/mogo-skin-light/src/main/module-v2x-res/values-xhdpi/dimens.xml +++ b/skin/mogo-skin-light/src/main/module-v2x-res/values-xhdpi/dimens.xml @@ -2,5 +2,3 @@ 42px - - diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/values/dimens.xml b/skin/mogo-skin-light/src/main/module-v2x-res/values/dimens.xml index 311b8d6151..ddcdea848e 100644 --- a/skin/mogo-skin-light/src/main/module-v2x-res/values/dimens.xml +++ b/skin/mogo-skin-light/src/main/module-v2x-res/values/dimens.xml @@ -3,4 +3,3 @@ 24px - From 904d6cf7cf48d9fed66b798fc40f7b31b42c5ac2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 8 Sep 2020 14:38:19 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86V2X=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E8=8E=B7=E5=8F=96=E5=91=A8=E8=BE=B9=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E7=9A=84=E6=96=B9=E5=BC=8F=E4=B8=BAhttp=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=BB=93=E6=9E=9C=E7=9A=84=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/module/v2x/V2XMarkerService.java | 23 +++++++++-- .../com/mogo/module/v2x/V2XSocketManager.java | 4 ++ .../module/v2x/network/V2XApiService.java | 9 ++++- .../module/v2x/network/V2XRefreshModel.java | 38 ++++++++++++++++++- 4 files changed, 68 insertions(+), 6 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XMarkerService.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XMarkerService.java index 69497f597a..3556667786 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XMarkerService.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XMarkerService.java @@ -5,7 +5,9 @@ import android.os.Handler; import com.mogo.map.MogoLatLng; import com.mogo.map.location.MogoLocation; +import com.mogo.module.common.entity.MarkerResponse; import com.mogo.module.v2x.listener.V2XLocationListener; +import com.mogo.module.v2x.network.V2XRefreshCallback; import com.mogo.module.v2x.network.V2XRefreshModel; import com.mogo.utils.logger.Logger; @@ -18,7 +20,7 @@ import static com.mogo.module.v2x.V2XConst.MODULE_NAME; * desc : * version: 1.0 */ -public class V2XMarkerService { +public class V2XMarkerService implements V2XRefreshCallback { private final String TAG = "V2XMarkerService"; // 一分钟获取一次最新的路况信息 @@ -48,12 +50,13 @@ public class V2XMarkerService { public void refreshMarkerData(MogoLocation location) { try { if (mV2XRefreshModel != null && location != null) { - //Logger.d(MODULE_NAME, "V2X道路事件：执行气泡刷新操作。"); + Logger.d(MODULE_NAME, "V2X道路事件：执行气泡刷新操作。"); // 获取目前最新的周边的poi点 - mV2XRefreshModel.querySnapshotAsync( + mV2XRefreshModel.querySnapshotSync( new MogoLatLng(location.getLatitude(), location.getLongitude()), (int) getMapCameraFactWidth(), - 999); + 999, + this); } } catch (Exception e) { e.printStackTrace(); @@ -105,4 +108,16 @@ public class V2XMarkerService { } refreshHandler.post(refreshRunnable); } + + @Override + public void onSuccess(MarkerResponse result) { + if (V2XSocketManager.getInstance().getV2XMessageListener_401011() != null) { + V2XSocketManager.getInstance().getV2XMessageListener_401011().onMsgReceived(result); + } + } + + @Override + public void onFail(String msg) { + Logger.e(TAG, "刷新V2X道路事件异常请检查参数"); + } } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XSocketManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XSocketManager.java index 1d29df1df1..36c68f8619 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XSocketManager.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XSocketManager.java @@ -120,6 +120,10 @@ public class V2XSocketManager { ); } + public V2XMessageListener_401011 getV2XMessageListener_401011() { + return v2XMessageListener_401011; + } + /** * 道路事件，服务端下发 */ diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XApiService.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XApiService.java index 2345952ffa..8efd454b4c 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XApiService.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XApiService.java @@ -39,12 +39,19 @@ public interface V2XApiService { Observable refreshHeartBeat(@FieldMap Map liveBroadcast); /** - * 刷新地图气泡点 + * 刷新地图气泡点，异步获取 */ @FormUrlEncoded @POST("/yycp-launcherSnapshot/launcherSnapshot/querySnapshotAsync") Observable querySnapshotAsync(@FieldMap Map parameters); + /** + * 刷新地图气泡点，同步获取 + */ + @FormUrlEncoded + @POST("/yycp-launcherSnapshot/launcherSnapshot/querySnapshotSync") + Observable querySnapshotSync(@FieldMap Map parameters); + /** * 直播点赞 */ diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XRefreshModel.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XRefreshModel.java index 947cdffe39..f5de5e4ca9 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XRefreshModel.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XRefreshModel.java @@ -67,7 +67,7 @@ public class V2XRefreshModel { } /** - * 刷新地图点数据 + * 刷新地图点数据，同步获取 */ public void querySnapshotAsync(MogoLatLng latLng, int radius, int limit) { if (mV2XApiService != null) { @@ -96,6 +96,42 @@ public class V2XRefreshModel { } } + /** + * 刷新地图点数据,同步获取 + */ + public void querySnapshotSync(MogoLatLng latLng, int radius, int limit, final V2XRefreshCallback callback) { + if (mV2XApiService != null) { + final Map query = new ParamsProvider.Builder(mContext).build(); + final RefreshBody refreshBody = new RefreshBody(); + refreshBody.limit = limit; + refreshBody.location = new RefreshBody.LatLon(latLng.lat, latLng.lon); + refreshBody.radius = radius; + refreshBody.dataType.add(ServiceConst.CARD_TYPE_ROAD_CONDITION); + refreshBody.viewPush = true; + query.put("data", GsonUtil.jsonFromObject(refreshBody)); + mV2XApiService.querySnapshotSync(query) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new SubscribeImpl(RequestOptions.create(mContext)) { + @Override + public void onSuccess(MarkerResponse o) { + super.onSuccess(o); + if (callback != null) { + callback.onSuccess(o); + } + } + + @Override + public void onError(String message, int code) { + super.onError(message, code); + if (callback != null) { + callback.onFail(message); + } + } + }); + } + } + /** * 触发刷新直播心跳 * From 55253380a57c888093212d85057b02020b0867b8 Mon Sep 17 00:00:00 2001 From: liujing Date: Tue, 8 Sep 2020 15:29:36 +0800 Subject: [PATCH 5/7] [add] m4 --- .../main/res/drawable-mdpi/v2x_shadow_bg.9.png | Bin 0 -> 2460 bytes .../src/main/res/values-mdpi/dimens.xml | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_shadow_bg.9.png diff --git a/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_shadow_bg.9.png b/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_shadow_bg.9.png new file mode 100644 index 0000000000000000000000000000000000000000..a4c313e3539f580612c42321cdfe7a77c7a37284 GIT binary patch literal 2460 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 ad;SA-9)l@a{r@Qd000016px 17px 15.4px - 74px + 80px 16px 117px 200px @@ -73,7 +73,7 @@ 15px 29px -8px - 57px + 65px From e9880f35a311706cc2891d0a83622d77c9c24f70 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Tue, 8 Sep 2020 15:33:40 +0800 Subject: [PATCH 6/7] =?UTF-8?q?1.=20=E4=BC=98=E5=8C=96=E5=B0=8F=E6=99=BA?= =?UTF-8?q?=E5=8A=A8=E7=94=BB=E5=AE=9E=E7=8E=B0=202.=20=E5=85=A5=E5=8F=A3?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=B7=BB=E5=8A=A0=E7=99=BD=E5=A4=A9=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E7=9A=84=E9=98=B4=E5=BD=B1=203.=20=E5=A4=A7=E8=80=8C?= =?UTF-8?q?=E5=85=A8=E6=95=B0=E6=8D=AE=EF=BC=88=E7=9F=AD=E9=93=BE+?= =?UTF-8?q?=E9=95=BF=E9=93=BE=EF=BC=89->=20=E5=8D=95=E7=8B=AC=E7=9F=AD?= =?UTF-8?q?=E9=93=BE=204.=20=E5=86=85=E5=AD=98=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 2 +- config.gradle | 2 +- .../com/mogo/commons/mvp/MvpFragment.java | 2 +- .../mogo/map/impl/amap/AMapViewWrapper.java | 5 +- .../mogo/module/apps/anim/AnimWrapper.java | 13 +---- .../com/mogo/module/apps/anim/OthersAnim.java | 44 ++++++++++++----- .../src/main/res/values-xhdpi/dimens.xml | 1 + .../src/main/res/values/dimens.xml | 1 + .../drawable-ldpi/module_ext_ic_message2.png | Bin 0 -> 668 bytes .../drawable-ldpi/module_ext_shadow_bkg.9.png | Bin 0 -> 2460 bytes .../drawable-mdpi/module_ext_ic_message2.png | Bin 0 -> 668 bytes .../drawable-mdpi/module_ext_shadow_bkg.9.png | Bin 0 -> 2460 bytes .../drawable-xhdpi/module_ext_ic_message2.png | Bin 1152 -> 1088 bytes .../module_ext_shadow_bkg.9.png | Bin 0 -> 3928 bytes .../res/drawable/module_ext_shadow_bkg.9.png | Bin 0 -> 2460 bytes .../layout/module_ext_layout_extensions.xml | 25 +++++----- .../src/main/res/values-mdpi/dimens.xml | 4 ++ .../res/values-xhdpi-1920x1000/dimens.xml | 3 +- .../src/main/res/values-xhdpi/dimens.xml | 3 +- .../src/main/res/values/dimens.xml | 3 +- .../com/mogo/module/service/MogoServices.java | 13 +++-- .../service/marker/MapMarkerManager.java | 14 +++++- .../module/service/network/RefreshModel.java | 45 ++++++++++++++++++ .../module_ext_shadow_bkg_light.9.png | Bin 0 -> 2778 bytes .../module_ext_shadow_bkg_light.9.png | Bin 0 -> 2778 bytes .../module_ext_shadow_bkg_light.9.png | Bin 0 -> 4650 bytes .../module_ext_shadow_bkg_light.9.png | Bin 0 -> 2778 bytes 27 files changed, 131 insertions(+), 49 deletions(-) create mode 100755 modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_message2.png create mode 100644 modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_shadow_bkg.9.png create mode 100755 modules/mogo-module-extensions/src/main/res/drawable-mdpi/module_ext_ic_message2.png create mode 100644 modules/mogo-module-extensions/src/main/res/drawable-mdpi/module_ext_shadow_bkg.9.png mode change 100644 => 100755 modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_message2.png create mode 100644 modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_shadow_bkg.9.png create mode 100644 modules/mogo-module-extensions/src/main/res/drawable/module_ext_shadow_bkg.9.png create mode 100644 modules/mogo-module-extensions/src/main/res/values-mdpi/dimens.xml create mode 100644 skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_shadow_bkg_light.9.png create mode 100644 skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_shadow_bkg_light.9.png create mode 100644 skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_shadow_bkg_light.9.png create mode 100644 skin/mogo-skin-light/src/main/module-extensions-res/drawable/module_ext_shadow_bkg_light.9.png diff --git a/.idea/misc.xml b/.idea/misc.xml index cd77a1f062..21e99e2dc0 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/config.gradle b/config.gradle index 0a9540a611..8a952748cd 100644 --- a/config.gradle +++ b/config.gradle @@ -160,7 +160,7 @@ targetSdkVersion : 22, gpssimulatornoop : "com.mogo.module:module-gps-simulator-noop:${MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION}", adasapi : "com.zhidao.autopilot.support:adas:1.0.1", - adasconfigapi : "com.zhidao.adasconfig:adasconfig:1.0.8", + adasconfigapi : "com.zhidao.adasconfig:adasconfig:1.0.9", // 个人中心的SDK personalsdk : "com.zhidaoauto.person.info:data:1.0.1", diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpFragment.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpFragment.java index 5d299590a0..b7f21772f4 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpFragment.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpFragment.java @@ -47,7 +47,6 @@ public abstract class MvpFragment> exten @Override public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); - initViews(savedInstanceState); } /** @@ -61,6 +60,7 @@ public abstract class MvpFragment> exten public void onActivityCreated(@Nullable Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); initViews(); + initViews(savedInstanceState); mPresenter = createPresenter(); getViewLifecycleOwner().getLifecycle().addObserver(mPresenter); } diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java index b84a513112..922690857b 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java @@ -70,7 +70,7 @@ public class AMapViewWrapper implements IMogoMapView, AMap.OnCameraChangeListener, AMap.OnMyLocationChangeListener { - private static final String TAG = "AMapNaviViewWrapper"; + private static final String TAG = "AMapViewWrapper"; private final MapView mMapView; private IMogoMap mIMap; @@ -243,6 +243,9 @@ public class AMapViewWrapper implements IMogoMapView, @Override public void onLowMemory() { + if ( mMapView != null ) { + mMapView.onLowMemory(); + } Logger.d( TAG, "map onLowMemory" ); } diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/anim/AnimWrapper.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/anim/AnimWrapper.java index bf38719907..aad3f187c8 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/anim/AnimWrapper.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/anim/AnimWrapper.java @@ -28,17 +28,8 @@ public class AnimWrapper implements Anim { public void initAnim( ImageView target ) { mTarget = target; if ( CarSeries.getSeries() == CarSeries.CAR_SERIES_F80X ) { - ThreadPoolService.execute( () -> { - final AnimationDrawable drawable = new AnimationDrawable(); - for ( int i = 0; i < AnimRes.sRes.length; i++ ) { - drawable.addFrame( target.getResources().getDrawable( AnimRes.sRes[i] ), 100 ); - } - UiThreadHandler.post( () -> { - target.setBackground( drawable ); - mDelegate = new OthersAnim( drawable ); - start(); - } ); - } ); + mDelegate = new OthersAnim( target ); + start(); } else { mTarget.setImageResource( R.drawable.mogo_tts_icon_00000 ); } diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/anim/OthersAnim.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/anim/OthersAnim.java index 13156b1e7c..aa7259c6ae 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/anim/OthersAnim.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/anim/OthersAnim.java @@ -1,6 +1,9 @@ package com.mogo.module.apps.anim; -import android.graphics.drawable.AnimationDrawable; +import android.os.Handler; +import android.os.Looper; +import android.os.Message; +import android.widget.ImageView; /** * @author congtaowang @@ -8,25 +11,44 @@ import android.graphics.drawable.AnimationDrawable; *

* 描述 */ -public class OthersAnim implements Anim{ +public class OthersAnim implements Anim { - private AnimationDrawable mDrawable; + private int mStartIndex = 0; - public OthersAnim( AnimationDrawable drawable ) { - this.mDrawable = drawable; + private final static int MSG_LOOP = 3003; + public static final long INTERVAL = 100L; + private boolean mStarted = false; + + private final ImageView mImageView; + + private Handler mHandler = new Handler( Looper.getMainLooper() ) { + @Override + public void handleMessage( Message msg ) { + super.handleMessage( msg ); + switch ( msg.what ) { + case MSG_LOOP: + if ( mStarted ) { + mImageView.setImageResource( AnimRes.sRes[mStartIndex++ % AnimRes.sRes.length] ); + mHandler.sendEmptyMessageDelayed( MSG_LOOP, INTERVAL ); + } + break; + } + } + }; + + public OthersAnim( ImageView imageView ) { + this.mImageView = imageView; } @Override public void start() { - if ( mDrawable != null ) { - mDrawable.start(); - } + mStarted = true; + mHandler.sendEmptyMessage( MSG_LOOP ); } @Override public void stop() { - if ( mDrawable != null ) { - mDrawable.stop(); - } + mStarted = false; + mHandler.removeMessages( MSG_LOOP ); } } diff --git a/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml index 17412b24d7..1770c16984 100644 --- a/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml @@ -1052,5 +1052,6 @@ 40px 42px 48px + -10px diff --git a/modules/mogo-module-common/src/main/res/values/dimens.xml b/modules/mogo-module-common/src/main/res/values/dimens.xml index 111cf6ee25..1e2c7b1cdc 100644 --- a/modules/mogo-module-common/src/main/res/values/dimens.xml +++ b/modules/mogo-module-common/src/main/res/values/dimens.xml @@ -1043,4 +1043,5 @@ 21.8750px 22.9688px 26.2500px + -8px diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_message2.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_message2.png new file mode 100755 index 0000000000000000000000000000000000000000..b6f6c4dd2597f38f6d0be04bb9518bf5195cb352 GIT binary patch literal 668 zcmeAS@N?(olHy`uVBq!ia0vp^Y9P$P3?%12mYf5m{s;JkxPs^r41RCD@CO(KAtgb6 z!3>N{%am@4pt4HYuR_KRjI=Lo80e zoe~**$U&fGr;5UYJ560D6u;NbJW;E`<>7Sc|Nrd?P5ef?+seD@X3kxgzdCL8w&O{b z)|?M#tb4Il^2>)^haGQycxitk?BW6+_FZcC9WEa{erm$!L+^iTeQsr&zAJd@Z~NSg zRu=y3#Wh#JQ#eI#-r zb%k{0bMkJMf*t;zwl^CNJmOIUpyT>QNCR+ z$jx_Q`m_Tk&-TrKG+Q~h?WU^ErjKu!CfzmpDtB>4%$GSg_^zdR=culIzWv)bt`-ZA UhIDU6U>GoXy85}Sb4q9e065;bHvj+t literal 0 HcmV?d00001 diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_shadow_bkg.9.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_shadow_bkg.9.png new file mode 100644 index 0000000000000000000000000000000000000000..a4c313e3539f580612c42321cdfe7a77c7a37284 GIT binary patch literal 2460 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 UhIDU6U>GoXy85}Sb4q9e065;bHvj+t literal 0 HcmV?d00001 diff --git a/modules/mogo-module-extensions/src/main/res/drawable-mdpi/module_ext_shadow_bkg.9.png b/modules/mogo-module-extensions/src/main/res/drawable-mdpi/module_ext_shadow_bkg.9.png new file mode 100644 index 0000000000000000000000000000000000000000..e73d76936fb2cbb1cac1aef6225df8a4dfad0202 GIT binary patch literal 2460 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 ZS~751)RKiP&7I^Pk~OrO^4W zY!?!oi?mt(a8AjR>~Bv#(6d&$={X0(V|j+x+uz@fMg pWB#}P`l|Ti!#n?3{*jMixE-N(^`hfz6JT0n@O1TaS?83{1OPrM$xr|Q literal 1152 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 literal 0 HcmV?d00001 diff --git a/modules/mogo-module-extensions/src/main/res/drawable/module_ext_shadow_bkg.9.png b/modules/mogo-module-extensions/src/main/res/drawable/module_ext_shadow_bkg.9.png new file mode 100644 index 0000000000000000000000000000000000000000..a4c313e3539f580612c42321cdfe7a77c7a37284 GIT binary patch literal 2460 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 ad;SA-9)l@a{r@Qd0000 - @@ -61,23 +63,20 @@ android:id="@+id/module_ext_id_msg_counter" android:layout_width="@dimen/module_ext_msg_counter_width" android:layout_height="@dimen/module_ext_msg_counter_height" - android:layout_gravity="center" - android:layout_marginLeft="@dimen/module_ext_msg_dot_marginLeft" - android:layout_marginBottom="@dimen/module_ext_msg_dot_marginRight" android:background="@drawable/module_ext_drawable_msg_bkg" android:gravity="center" + android:layout_alignParentRight="true" android:textColor="#FFFFFF" android:textSize="@dimen/module_ext_msg_counter_textSize" tools:text="···" /> - + + app:layout_constraintTop_toTopOf="parent" + tools:visibility="visible" /> \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-mdpi/dimens.xml new file mode 100644 index 0000000000..833a7c43be --- /dev/null +++ b/modules/mogo-module-extensions/src/main/res/values-mdpi/dimens.xml @@ -0,0 +1,4 @@ + + + 26px + \ No newline at end of file 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 a532dd0dd9..0304873cfe 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 @@ -55,7 +55,7 @@ 20px - 100px + 120px 60px 60px 32px @@ -145,4 +145,5 @@ 20px 40px + 45px \ No newline at end of file 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 00944d0a4f..6e8de9e26f 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 @@ -55,7 +55,7 @@ 20px - 120px + 140px 60px 60px 32px @@ -147,4 +147,5 @@ 34px 175px 30px + 45px \ No newline at end of file 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 00d9c62dbf..2f344bce6f 100644 --- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml @@ -56,7 +56,7 @@ 8px - 66px + 82px 32px 32px @@ -152,5 +152,6 @@ 19px 16px + 26px \ No newline at end of file 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 414fce1e7e..4738bc2a10 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 @@ -30,6 +30,7 @@ import com.mogo.map.navi.MogoTraffic; import com.mogo.map.uicontroller.IMogoMapUIController; import com.mogo.module.common.MogoModule; import com.mogo.module.common.MogoModulePaths; +import com.mogo.module.common.entity.MarkerResponse; import com.mogo.module.common.map.MapCenterPointStrategy; import com.mogo.module.common.map.Scene; import com.mogo.module.service.intent.IntentHandlerFactory; @@ -224,9 +225,10 @@ public class MogoServices implements IMogoMapListener, /** * 手动刷新回调 */ - private RefreshCallback mCustomRefreshCallback = new RefreshCallback() { + private RefreshCallback mCustomRefreshCallback = new RefreshCallback< MarkerResponse >() { @Override - public void onSuccess( Object o ) { + public void onSuccess( MarkerResponse o ) { + MapMarkerManager.getInstance().onSyncMarkerResponse( o ); mLoopRequest = false; // 用户手动操作地图刷新成功后，设置状态为 true，引发延时策略 mStatusManager.setUserInteractionStatus( ServiceConst.TYPE, true, true ); @@ -241,9 +243,10 @@ public class MogoServices implements IMogoMapListener, /** * 自动刷新回调 */ - private RefreshCallback mAutoRefreshCallback = new RefreshCallback() { + private RefreshCallback mAutoRefreshCallback = new RefreshCallback() { @Override - public void onSuccess( Object o ) { + public void onSuccess( MarkerResponse o ) { + MapMarkerManager.getInstance().onSyncMarkerResponse( o ); mLoopRequest = false; Logger.d( TAG, "request Success." ); invokeAutoRefreshStrategy(); @@ -436,7 +439,7 @@ public class MogoServices implements IMogoMapListener, Logger.w( TAG, "lonLat is null." ); return; } - mRefreshModel.refreshData( ro.mLonLat, ro.mRadius, ro.mAmount, ro.mCallback ); + mRefreshModel.refreshExplorerWayData( ro.mLonLat, ro.mRadius, ro.mAmount, ro.mCallback ); MapMarkerManager.getInstance().getOnlineCarDataByAutoRefreshStrategy( ro.mLonLat ); Logger.i( TAG, "刷新半径 = %s, 点 = %s, zoomLevel = %s, amount = %s", ro.mRadius, ro.mLonLat, mLastZoomLevel, ro.mAmount ); diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java index 3621019256..b291ee015f 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java @@ -109,8 +109,8 @@ public class MapMarkerManager implements IMogoMarkerClickListener, mContext = context.getApplicationContext(); mRefreshModel = new RefreshModel( mContext ); - // 长连接 - MarkerServiceHandler.getMogoSocketManager().registerOnMessageListener( 401001, this ); + // 长连接 - 长链变短链 +// MarkerServiceHandler.getMogoSocketManager().registerOnMessageListener( 401001, this ); MarkerServiceHandler.getActionManager().registerBizActionDoneListener( this ); MarkerServiceHandler.getApis().getRegisterCenterApi().registerADASControlStatusChangedListener( TAG, this ); } @@ -703,6 +703,16 @@ public class MapMarkerManager implements IMogoMarkerClickListener, } ); } + public void onSyncMarkerResponse(MarkerResponse response){ + if ( ignoreDrawRequest() ) { + return; + } + Logger.d( TAG, "接收到了地图大而全数据" ); + runOnTargetThread( () -> { + drawMapMarker( response ); + } ); + } + public void syncLocation( double lon, double lat ) { mCarLatLng = new MogoLatLng( lat, lon ); } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshModel.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshModel.java index 9cb03e4c88..c368ec6956 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshModel.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshModel.java @@ -110,6 +110,51 @@ public class RefreshModel { } } + public void refreshExplorerWayData( MogoLatLng latLng, int radius, int limit, final RefreshCallback callback ) { + if ( mRefreshApiService != null ) { + final Map< String, Object > query = new ParamsProvider.Builder( mContext ).build(); + final RefreshBody refreshBody = new RefreshBody(); + refreshBody.limit = limit; + refreshBody.location = new RefreshBody.LatLon( latLng.lat, latLng.lng ); + refreshBody.radius = radius; + refreshBody.dataType.add( ServiceConst.CARD_TYPE_ROAD_CONDITION ); + + String data = GsonUtil.jsonFromObject( refreshBody ); + query.put( "data", data ); + Logger.d( TAG, data ); + + + mRefreshApiService.refreshDataSync( query ) + .subscribeOn( Schedulers.io() ) + .observeOn( AndroidSchedulers.mainThread() ) + .subscribe( new SubscribeImpl< MarkerResponse >( RequestOptions.create( mContext ) ) { + @Override + public void onSuccess( MarkerResponse o ) { + super.onSuccess( o ); + if ( callback != null ) { + callback.onSuccess( o ); + } + } + + @Override + public void onError( Throwable e ) { + super.onError( e ); + if ( callback != null ) { + callback.onFail(); + } + } + + @Override + public void onError( String message, int code ) { + super.onError( message, code ); + if ( callback != null ) { + callback.onFail(); + } + } + } ); + } + } + public void refreshDataSync( MogoLatLng latLng, int radius, int limit, final RefreshCallback callback ) { if ( mRefreshApiService != null ) { final Map< String, Object > query = new ParamsProvider.Builder( mContext ).build(); diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_shadow_bkg_light.9.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_shadow_bkg_light.9.png new file mode 100644 index 0000000000000000000000000000000000000000..36ea7d6655132047f87041b3dc3c33b9cf0d8da9 GIT binary patch literal 2778 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 literal 0 HcmV?d00001 diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_shadow_bkg_light.9.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_shadow_bkg_light.9.png new file mode 100644 index 0000000000000000000000000000000000000000..36ea7d6655132047f87041b3dc3c33b9cf0d8da9 GIT binary patch literal 2778 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 literal 0 HcmV?d00001 diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_shadow_bkg_light.9.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_shadow_bkg_light.9.png new file mode 100644 index 0000000000000000000000000000000000000000..38680e4f41dc0f187d5cb293b45918626ab7dd78 GIT binary patch literal 4650 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 literal 0 HcmV?d00001 From 4fce69b4befa8b60a35d0dc346279cafa7316507 Mon Sep 17 00:00:00 2001 From: liujing Date: Tue, 8 Sep 2020 15:51:56 +0800 Subject: [PATCH 7/7] [add] m4 .9 --- .../res/drawable-ldpi/v2x_shadow_bg.9.png | Bin 2460 -> 2454 bytes .../res/drawable-mdpi/v2x_shadow_bg.9.png | Bin 2460 -> 2459 bytes .../res/drawable-xhdpi/v2x_shadow_bg.9.png | Bin 3936 -> 3927 bytes .../layout/view_event_panel_history_count.xml | 4 ++-- .../src/main/res/values-mdpi/dimens.xml | 3 +-- .../res/values-xhdpi-1920x1000/dimens.xml | 1 - .../src/main/res/values-xhdpi/dimens.xml | 2 +- .../src/main/res/values/dimens.xml | 3 +-- .../drawable-ldpi/v2x_shadow_bg_light.9.png | Bin 0 -> 2778 bytes .../drawable-xhdpi/v2x_shadow_bg_light.9.png | Bin 4657 -> 4650 bytes 10 files changed, 5 insertions(+), 8 deletions(-) create mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/v2x_shadow_bg_light.9.png diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_shadow_bg.9.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_shadow_bg.9.png index a4c313e3539f580612c42321cdfe7a77c7a37284..6ab0b1547c1a7560b9949023f478fe852b89f1bd 100644 GIT binary patch delta 2411 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 z zr=h@C1@QO+LiF?9MGH4v#QL1^F#x}lmQaA8{QQI&F)8y?m;L&ad<7(bzpLn-`+Wf+ z`uTB@>_E-$+Obo!US<_Np9Kii&!^)hm7SPqzA1qB7Z9kQ-|o)Y8NZWjy`FY-*1%^) z_~coF0`&9IxJhIOG9QHiUgpGW0Rr{&(Wr^!1~%SYdU~`7B@`euKfmp4y6Yq-W4#1l zXRiea(a*P=?HL9hG~5_}$c|>e_X33K=Vy)9HeL%n9yclQN$;Yp9uStF54T%7a$4Ze zP1D6i@cjY;^z)78bJGrFy}4)1SGj-T^96+I=R2&Y4OiDd4)Z@bS%YpR=)%7Qh3e-!3l;<&0Nw$*-|hc@X|h)d3enGZwp*(8 zVC?Jy=}Gb;czppO`uQ*tDm#Gn6nM#gzb_zAKfj3m8Q@s+mGqb*hyn~Q{S_coKVOfV z2{-ZdUCoE=Pkg?BQ2qQ4v)v-e>0$YS;Cp=mq5AnrZY$$0*L?v7^c?tZSrQbQpPw-H z0&2WQdR+E*`@Rc*5TKvm0n<*$DS`#P3)v6CYXL&^^XX>GEn5kc9Tk^lynrzMe3Qw< zlTg+Z_NRl-W%PjX{CqU+fLD+K4j2zuZwv9+?+Xag&*!#Vr`duRpqVdoT1Ejv^YgXb zm`%3;c*%SXzAC`(=Q3VEcz!;#7uHQY8TeU9@V&o)Q2l&=XVDU1!#STeT@8Fzh%bH% z5Tc*2@_@2m0)0sUzqITZz^6|vz?-K?P)L40+i*4e$qO*RgS)o^WWORFo}ce%J{dDp zqWKDV5j~Zc|N1LH`}j6QKi~R1m+Yct8t(v0k1E36SARd)B!53YL_c2xp91MgA?OBh zT>$+8mNNT)`^mDXJ-rIi&!<{%8!eu8bRl{<`(^ZZzg~Il0n@_}{d}nVaMnkK0H9~m zqu9UN9WMR-Y^D4W(pG$YADW-<%=o+O8t>BH_m}sJ#Xo*Obt2e*9h#rd7lD@?Spdm? znfrT7zdv0pkNiPuQGmyg{Cv9Eb^+sM!|fs2$zFhe0RM3?{#MR+1mrhULh|!dPVWa; z_qFus7tr7TTF%ec%OgKd(CSQYLhwmT}%P&W?yQf$3_w(E7{8j+_@LK)+{_dBDbZ>bpjWxmcD`_uy-*Br_o$6GlI@PI8 kb*fXH>QtvX&wKs@bRL5#S^fVh00000NkvWtM6N<$g2vwHod5s; diff --git a/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_shadow_bg.9.png b/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_shadow_bg.9.png index a4c313e3539f580612c42321cdfe7a77c7a37284..2466405ac2034f8577d12c040566da0888b2fc2e 100644 GIT binary patch delta 2380 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 S|0w_f002ovP6b4+LSTZ1<=!j+ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_shadow_bg.9.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_shadow_bg.9.png index 1de561aa65d4ba931973e4ebc98e31b8b6614d24..b8c97e4a3a1a279798d8bed6929141ec190d3bff 100644 GIT binary patch delta 3724 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 ukWfnhMC diff --git a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml index 28ecec3d52..f533855896 100644 --- a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml @@ -57,7 +57,7 @@ 16px 17px 15.4px - 80px + 82px 16px 117px 200px @@ -73,7 +73,6 @@ 15px 29px -8px - 65px diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml index 9c31211f00..a32a64e53a 100644 --- a/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml @@ -56,6 +56,5 @@ 42px 16px 120px - 114px diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml index 30bd6a2d2c..76dee8d2a8 100644 --- a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml @@ -56,7 +56,7 @@ 31.9px 26px 30px - 136px + 140px 219px 400px 281px diff --git a/modules/mogo-module-v2x/src/main/res/values/dimens.xml b/modules/mogo-module-v2x/src/main/res/values/dimens.xml index 41926f091f..577e034f68 100644 --- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml @@ -57,7 +57,7 @@ 16px 16px 20px - 74px + 82px 16px 117px 200px @@ -73,7 +73,6 @@ 15px 29px -8px - 38px diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/v2x_shadow_bg_light.9.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/v2x_shadow_bg_light.9.png new file mode 100644 index 0000000000000000000000000000000000000000..36ea7d6655132047f87041b3dc3c33b9cf0d8da9 GIT binary patch literal 2778 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 literal 0 HcmV?d00001 diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_shadow_bg_light.9.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_shadow_bg_light.9.png index e69d3fbacb536b0a648c9df7bb377e52efa1ba65..c351b202508de067d7514f8491c5961addc6263d 100644 GIT binary patch literal 4650 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 bjqMD9=hD@s!A0O75XjZZ!|~?+z@+~H;DD2k literal 4657 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