From 17abb0864a48c588623c333b272eaafd0dd2ce92 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Thu, 13 Aug 2020 10:31:24 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E5=85=A5=E5=8F=A3UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/service/intent/EmptyIntentHandler.java | 2 +- .../mogo/module/widgets/AutoNaviIntentHandler.java | 12 ++++++++++++ .../res/drawable/module_widgets_app_entrance_bkg.xml | 9 --------- .../main/res/layout/module_widgets_app_entrance.xml | 5 +++-- .../src/main/res/values-ldpi/dimens.xml | 4 ++-- .../src/main/res/values-mdpi/dimens.xml | 4 ++-- .../src/main/res/values/strings.xml | 2 +- 7 files changed, 21 insertions(+), 17 deletions(-) delete mode 100644 modules/mogo-module-widgets/src/main/res/drawable/module_widgets_app_entrance_bkg.xml diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/EmptyIntentHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/EmptyIntentHandler.java index 64d6edd24a..270dcf35d3 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/EmptyIntentHandler.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/EmptyIntentHandler.java @@ -17,6 +17,6 @@ public class EmptyIntentHandler implements IntentHandler { @Override public void handle( Context context, Intent intent ) { - Logger.w( TAG, "空实现." ); + Logger.w( TAG, "空实现. %s", intent.getAction() ); } } diff --git a/modules/mogo-module-widgets/src/main/java/com/mogo/module/widgets/AutoNaviIntentHandler.java b/modules/mogo-module-widgets/src/main/java/com/mogo/module/widgets/AutoNaviIntentHandler.java index 3773c41930..77f525cb39 100644 --- a/modules/mogo-module-widgets/src/main/java/com/mogo/module/widgets/AutoNaviIntentHandler.java +++ b/modules/mogo-module-widgets/src/main/java/com/mogo/module/widgets/AutoNaviIntentHandler.java @@ -8,10 +8,14 @@ import android.view.WindowManager; import com.mogo.commons.AbsMogoApplication; import com.mogo.commons.debug.DebugConfig; import com.mogo.module.common.wm.WindowManagerView; +import com.mogo.utils.CommonUtils; import com.mogo.utils.LaunchUtils; import com.mogo.utils.ResourcesHelper; import com.mogo.utils.logger.Logger; +import java.util.HashMap; +import java.util.Map; + public /** * @author congtaowang @@ -40,6 +44,7 @@ class AutoNaviIntentHandler { } private WindowManagerView mWindowManagerView; + private Map< String, Object > mProperties = new HashMap<>(); public synchronized void release() { sInstance = null; @@ -95,6 +100,12 @@ class AutoNaviIntentHandler { } else { LaunchUtils.launchByPkg( context, "com.mogo.launcher.app" ); } + if ( mProperties.isEmpty() ) { + mProperties.put( "appname", CommonUtils.getAppName( context ) ); + mProperties.put( "appversion", CommonUtils.getVersionName( context ) ); + mProperties.put( "from", 9 ); + } + MogoWidgetManger.getInstance().getApis().getAnalyticsApi().track( "appenterfront", mProperties ); } catch ( Exception e ) { Logger.e( TAG, e, "error." ); } @@ -102,6 +113,7 @@ class AutoNaviIntentHandler { } try { mWindowManagerView.show(); + MogoWidgetManger.getInstance().getApis().getAnalyticsApi().track( "NAVI_button_show", null ); } catch ( Exception e ) { Logger.e( TAG, e, "error." ); } diff --git a/modules/mogo-module-widgets/src/main/res/drawable/module_widgets_app_entrance_bkg.xml b/modules/mogo-module-widgets/src/main/res/drawable/module_widgets_app_entrance_bkg.xml deleted file mode 100644 index b46cff52de..0000000000 --- a/modules/mogo-module-widgets/src/main/res/drawable/module_widgets_app_entrance_bkg.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/modules/mogo-module-widgets/src/main/res/layout/module_widgets_app_entrance.xml b/modules/mogo-module-widgets/src/main/res/layout/module_widgets_app_entrance.xml index cacbb2a8e2..5ea9b7fe2a 100644 --- a/modules/mogo-module-widgets/src/main/res/layout/module_widgets_app_entrance.xml +++ b/modules/mogo-module-widgets/src/main/res/layout/module_widgets_app_entrance.xml @@ -3,11 +3,12 @@ android:id="@+id/module_widgets_app_entrance_root" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@drawable/module_widgets_app_entrance_bkg" + android:background="@drawable/module_widgets_app_entrance_img_bkg" + android:gravity="center" android:orientation="vertical"> 20px 15px 2px - 112px - 929px + 505px + 501px 10px 15px 71px diff --git a/modules/mogo-module-widgets/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-widgets/src/main/res/values-mdpi/dimens.xml index 3aa8cdc5a8..bbd70cad6e 100644 --- a/modules/mogo-module-widgets/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-widgets/src/main/res/values-mdpi/dimens.xml @@ -3,8 +3,8 @@ 20px 15px 2px - 112px - 929px + 505px + 501px 10px 15px 71px diff --git a/modules/mogo-module-widgets/src/main/res/values/strings.xml b/modules/mogo-module-widgets/src/main/res/values/strings.xml index 717eefe1fe..d824f729d5 100644 --- a/modules/mogo-module-widgets/src/main/res/values/strings.xml +++ b/modules/mogo-module-widgets/src/main/res/values/strings.xml @@ -1,4 +1,4 @@ mogo-module-service - 辅助\n驾驶 + 切换辅助驾驶 From b731d815c8ad11c098c59de688232fb26f6b443c Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Thu, 13 Aug 2020 10:32:53 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module_widgets_app_entrance_img_bkg.png | Bin 0 -> 1432 bytes .../module_widgets_app_entrance_img_bkg.png | Bin 0 -> 1432 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 modules/mogo-module-widgets/src/main/res/drawable-ldpi/module_widgets_app_entrance_img_bkg.png create mode 100644 modules/mogo-module-widgets/src/main/res/drawable/module_widgets_app_entrance_img_bkg.png diff --git a/modules/mogo-module-widgets/src/main/res/drawable-ldpi/module_widgets_app_entrance_img_bkg.png b/modules/mogo-module-widgets/src/main/res/drawable-ldpi/module_widgets_app_entrance_img_bkg.png new file mode 100644 index 0000000000000000000000000000000000000000..0af1eeda0184e2205a394d4ab336c5f49231a21f GIT binary patch literal 1432 zcmV;J1!ww+P)002%10{{R3kYDZX0001cP)t-sUteD< zD=RuDCo3u{DJUo{BO@#%Br!2DEGa4dqZj?f12HEjf@2ygB_+R$6DlJk>X;Ymy94;3 z82G*i|D+cGv}LvJd~N6aTmi|Go(Sun_;c3je$b|F#VO!Ug}V692^m z|E3oI#03Az0sqGX|H=Vf9K&k>000zpQchC>1q~M^Ge8O-?CcstIVUE#xU8)G61DvR z00g*6L_t(&-qo6EcG^G?goA{G*o+rqa4=>O0^k3H;n6d$hYEFRaDG6a;Ct13&-}U< z>)f2x@Or)MrmWX9#EAF!(w{2Zoox1Pf6cZhn{VeQTLybS*`IG)n=Q;f%~oa~!QP^6 zHk-lgBM^^#jK_S22)tk(9|+I+7RDD0d>}j`9tk5~_A+f@=K_My2+fF33J5~boveDz z0%0f1A)u$=8Q%zZzABSKau&Rb8VW*cD zZ5_-J2tELkg3yooK32pR0gK!KGXSOvxD6>14RoBsAXF&~z$^fEr`lRXU`;+Hpjoqk zRW||9^aCOINI+2oMG@S@2qZvdDK!R!3`qJl3Rn`L6p%bjcq||T0uc@dVc-)kRw)8J zB7BeLI(Sv{FlUGYOz*-Rfhf{Cg_*ESbTJn}S3m$dDdI$6qJmQrurUOw2)60M+(m?f zNdoE;!x;j)i+qWIlp)TXB|O~Jg*in^0u&B*1SG!XK{c8KDE$l5Da;Wl0673tTzpx; zNGNg`a~1~aPc2|sY6XEer6yv0qQ-C&p(0341QI3yPDKjKIdHAU7>o&Uu>{ns2tqL8 zErF*~SY(IYe!1BO= zdQcUUzADn%!5iaa1@)A`T~2sd>~dzTpK@`!fMJ)@9_Av=V*&&`NEctfD(Nn_a>j(J zlnR1RuS#&R9<=l_3_PhIQW!>f4j}NHa}10kkN`yhY5`e44aoW-1X}@85o85ZYK$0T zDs&MEh$g&Kn}~aG176EXI^wl-ak7A78P-jtiVkk0pfjk>&ud^>3JU=v;hq6?7lDKI zIfgStPx^3iO9g=^+Hm?k>*Ama{e*(xbGwL>A;QCNb-)UM2lKG6;EuWotxD3t?m31- z&`KZ#lnUyLYElI1a|{4W2ILG$t1)^N5h+Z31W1G`MV4u+h`(&21WFgf!RpaL-^@7z zy*6AzK&ha6u~g4;B%r7B}(i2v7(}d_TQs@fZXBEJFy;({CnD zzT%$6H+_B-sfVBdlwAaT;$|*uU?c>dR&a+RNO;tRQ^tf3_t60vq5yRY>s^i$3WLwNX915Cl!GcJ zeSI%ltkvfZ-b5Jiivay)*a2(`K=teujK&zla{$Gls^8@jBM^W}L0w~Xk>(H-&vL|P z8A1w*lX*%6f=@&s-;0nTdk>J7;cIregm**m0g)8+ZsyyoRwean!!@P^9wmv_M6P;O z;-`OhFjAOnjHjUJa{ql$F-7Kun9h$ zBFGRBJ{JM7mlvb{rI&x_UgR#r{5i(iHP1pY(47DWqxiY3mkqn4r#=_yMgc+i^OG;n zsfPDF>e}}_^YP?iJpO${HXc7r%)=&OUUVl9H)WGla99-G8?vGp8lM3k3A6mh mEIaab?&YKR9ekC)VfzO*A5ys&CVMde0000002%10{{R3kYDZX0001cP)t-sUteD< zD=RuDCo3u{DJUo{BO@#%Br!2DEGa4dqZj?f12HEjf@2ygB_+R$6DlJk>X;Ymy94;3 z82G*i|D+cGv}LvJd~N6aTmi|Go(Sun_;c3je$b|F#VO!Ug}V692^m z|E3oI#03Az0sqGX|H=Vf9K&k>000zpQchC>1q~M^Ge8O-?CcstIVUE#xU8)G61DvR z00g*6L_t(&-qo6EcG^G?goA{G*o+rqa4=>O0^k3H;n6d$hYEFRaDG6a;Ct13&-}U< z>)f2x@Or)MrmWX9#EAF!(w{2Zoox1Pf6cZhn{VeQTLybS*`IG)n=Q;f%~oa~!QP^6 zHk-lgBM^^#jK_S22)tk(9|+I+7RDD0d>}j`9tk5~_A+f@=K_My2+fF33J5~boveDz z0%0f1A)u$=8Q%zZzABSKau&Rb8VW*cD zZ5_-J2tELkg3yooK32pR0gK!KGXSOvxD6>14RoBsAXF&~z$^fEr`lRXU`;+Hpjoqk zRW||9^aCOINI+2oMG@S@2qZvdDK!R!3`qJl3Rn`L6p%bjcq||T0uc@dVc-)kRw)8J zB7BeLI(Sv{FlUGYOz*-Rfhf{Cg_*ESbTJn}S3m$dDdI$6qJmQrurUOw2)60M+(m?f zNdoE;!x;j)i+qWIlp)TXB|O~Jg*in^0u&B*1SG!XK{c8KDE$l5Da;Wl0673tTzpx; zNGNg`a~1~aPc2|sY6XEer6yv0qQ-C&p(0341QI3yPDKjKIdHAU7>o&Uu>{ns2tqL8 zErF*~SY(IYe!1BO= zdQcUUzADn%!5iaa1@)A`T~2sd>~dzTpK@`!fMJ)@9_Av=V*&&`NEctfD(Nn_a>j(J zlnR1RuS#&R9<=l_3_PhIQW!>f4j}NHa}10kkN`yhY5`e44aoW-1X}@85o85ZYK$0T zDs&MEh$g&Kn}~aG176EXI^wl-ak7A78P-jtiVkk0pfjk>&ud^>3JU=v;hq6?7lDKI zIfgStPx^3iO9g=^+Hm?k>*Ama{e*(xbGwL>A;QCNb-)UM2lKG6;EuWotxD3t?m31- z&`KZ#lnUyLYElI1a|{4W2ILG$t1)^N5h+Z31W1G`MV4u+h`(&21WFgf!RpaL-^@7z zy*6AzK&ha6u~g4;B%r7B}(i2v7(}d_TQs@fZXBEJFy;({CnD zzT%$6H+_B-sfVBdlwAaT;$|*uU?c>dR&a+RNO;tRQ^tf3_t60vq5yRY>s^i$3WLwNX915Cl!GcJ zeSI%ltkvfZ-b5Jiivay)*a2(`K=teujK&zla{$Gls^8@jBM^W}L0w~Xk>(H-&vL|P z8A1w*lX*%6f=@&s-;0nTdk>J7;cIregm**m0g)8+ZsyyoRwean!!@P^9wmv_M6P;O z;-`OhFjAOnjHjUJa{ql$F-7Kun9h$ zBFGRBJ{JM7mlvb{rI&x_UgR#r{5i(iHP1pY(47DWqxiY3mkqn4r#=_yMgc+i^OG;n zsfPDF>e}}_^YP?iJpO${HXc7r%)=&OUUVl9H)WGla99-G8?vGp8lM3k3A6mh mEIaab?&YKR9ekC)VfzO*A5ys&CVMde0000 Date: Thu, 13 Aug 2020 10:44:35 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E8=B0=83=E6=95=B4UI=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../layout/module_v2x_event_panel_fragment_event_panel.xml | 1 + .../src/main/res/layout/view_history_empty.xml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) 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 9379fbfae5..051d0557f0 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 @@ -10,6 +10,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="#10121E" + android:clickable="true" android:paddingStart="@dimen/dp_30" android:paddingEnd="@dimen/dp_30" android:visibility="gone" diff --git a/modules/mogo-module-v2x/src/main/res/layout/view_history_empty.xml b/modules/mogo-module-v2x/src/main/res/layout/view_history_empty.xml index 0d93925d85..e1adf9b0e5 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/view_history_empty.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/view_history_empty.xml @@ -6,8 +6,8 @@ Date: Thu, 13 Aug 2020 10:55:00 +0800 Subject: [PATCH 04/11] =?UTF-8?q?scheme=20=E8=B7=B3=E8=BD=AC=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=9D=A5=E6=BA=90=E5=9F=8B=E7=82=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/module/main/SchemeIntent.java | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java index d39eec80db..c0ce50ba8b 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java @@ -14,6 +14,8 @@ import com.mogo.service.intent.IMogoIntentListener; import com.mogo.service.intent.IMogoIntentManager; import com.mogo.service.statusmanager.IMogoStatusChangedListener; import com.mogo.service.statusmanager.StatusDescriptor; +import com.mogo.utils.AppUtils; +import com.mogo.utils.CommonUtils; import com.mogo.utils.TipToast; import com.mogo.utils.UiThreadHandler; import com.mogo.utils.logger.Logger; @@ -35,6 +37,8 @@ public class SchemeIntent implements IMogoStatusChangedListener { public static final String TYPE_NAVI = "navi"; + public static final String TYPE_LAUNCH = "launch"; + private IMogoServiceApis mApis; private Context mContext; @@ -84,10 +88,10 @@ public class SchemeIntent implements IMogoStatusChangedListener { handleSwitch2Action( target ); break; case "/main/share": - Logger.d(TAG,"收到打开分享框的scheme，准备打开分享框"); + Logger.d( TAG, "收到打开分享框的scheme，准备打开分享框" ); Map< String, Object > properties = new HashMap<>(); properties.put( "from", "1" ); - mApis.getAnalyticsApi().track("v2x_share_click", properties); + mApis.getAnalyticsApi().track( "v2x_share_click", properties ); mApis.getShareManager().showShareDialog(); break; default: @@ -115,6 +119,10 @@ public class SchemeIntent implements IMogoStatusChangedListener { case TYPE_NAVI: handleNaviIntent( target ); break; + case TYPE_LAUNCH: + handleLaunchIntent( target ); + break; + } } @@ -145,6 +153,15 @@ public class SchemeIntent implements IMogoStatusChangedListener { } } + private void handleLaunchIntent( Uri uri ) { + String type = uri.getQueryParameter( "channelType" ); + Map< String, Object > properties = new HashMap<>(); + properties.put( "appname", CommonUtils.getAppName( mContext ) ); + properties.put( "appversion", CommonUtils.getVersionName( mContext ) ); + properties.put( "from", type ); + mApis.getAnalyticsApi().track( "appenterfront", properties ); + } + @Override public void onStatusChanged( StatusDescriptor descriptor, boolean isTrue ) { if ( descriptor == StatusDescriptor.MAIN_PAGE_RESUME ) { From 68b82726f445e20ade79a16897a059cfbcc7a1b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Thu, 13 Aug 2020 11:25:28 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E6=9B=B4=E5=A4=9A=E6=95=B0=E6=8D=AE=E7=9A=84=E5=BA=95?= =?UTF-8?q?=E9=83=A8View?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapter/V2XScenarioHistoryAdapter.java | 56 ++++++++++++++----- .../main/res/layout/footer_nomore_view.xml | 44 +++++++++++++++ 2 files changed, 85 insertions(+), 15 deletions(-) create mode 100644 modules/mogo-module-v2x/src/main/res/layout/footer_nomore_view.xml diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XScenarioHistoryAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XScenarioHistoryAdapter.java index 0f8f07f4e4..f72e4f8e4b 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XScenarioHistoryAdapter.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XScenarioHistoryAdapter.java @@ -1,12 +1,16 @@ package com.mogo.module.v2x.adapter; +import android.view.LayoutInflater; +import android.view.View; import android.view.ViewGroup; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView.ViewHolder; import com.mogo.module.common.entity.V2XHistoryScenarioData; import com.mogo.module.common.entity.V2XMessageEntity; +import com.mogo.module.v2x.R; import com.mogo.module.v2x.adapter.holder.V2XScenarioHistoryIllegalParkVH; import com.mogo.module.v2x.adapter.holder.V2XScenarioHistoryOtherSeekHelpVH; import com.mogo.module.v2x.adapter.holder.V2XScenarioHistoryRoadEventVH; @@ -16,7 +20,7 @@ import java.util.ArrayList; /** * @author donghongyu */ -public class V2XScenarioHistoryAdapter extends RecyclerView.Adapter { +public class V2XScenarioHistoryAdapter extends RecyclerView.Adapter { private ArrayList mV2XHistoryScenarioData; @@ -28,8 +32,8 @@ public class V2XScenarioHistoryAdapter extends RecyclerView.Adapter + + + + + + + + + \ No newline at end of file From 0d71a377db5cbba78939307182da9c906f79ba97 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Thu, 13 Aug 2020 11:33:41 +0800 Subject: [PATCH 06/11] opt --- .../v2x/fragment/V2XSurroundingFragment.java | 20 +++++++++++++++++++ ...odule_event_panel_fragment_surrounding.xml | 19 +++++++++++++----- 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java index 9766af55f0..17d4904862 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java @@ -9,9 +9,12 @@ import android.text.style.AbsoluteSizeSpan; import android.text.style.ForegroundColorSpan; import android.text.style.StyleSpan; import android.util.Log; +import android.view.LayoutInflater; import android.view.View; +import android.view.ViewGroup; import android.view.animation.AccelerateInterpolator; import android.view.animation.LinearInterpolator; +import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; @@ -35,6 +38,8 @@ import com.mogo.module.v2x.adapter.V2XSurroundingAdapter; import com.mogo.module.v2x.entity.panel.SurroundingConstruction; import com.mogo.module.v2x.listener.SurroundingItemClickListener; import com.mogo.module.v2x.presenter.SurroundingEventPresenter; +import com.mogo.module.v2x.utils.animation.AnimationResources; +import com.mogo.module.v2x.utils.animation.V2XAnimationManager; import com.mogo.module.v2x.view.SurroundingEventView; import com.mogo.module.v2x.view.SurroundingMarginDecoration; import com.mogo.service.IMogoServiceApis; @@ -68,6 +73,9 @@ public class V2XSurroundingFragment extends MvpFragment poiInfosList = new ArrayList<>(); private IMogoServiceApis mApis; + private V2XAnimationManager mV2XAnimationManager; + private ImageView mloadingImage; + @Override protected int getLayoutId() { @@ -75,9 +83,17 @@ public class V2XSurroundingFragment extends MvpFragment "); + mV2XAnimationManager = new V2XAnimationManager(); mRecyclerView = findViewById(R.id.surrounding_recycleview); mTotalTv = findViewById(R.id.tv_brief); mTopLayout = findViewById(R.id.layout_top); @@ -85,6 +101,7 @@ public class V2XSurroundingFragment extends MvpFragment exploreWayList) { + mV2XAnimationManager.stop(); if (exploreWayList != null && exploreWayList.size() > 0) { //展示数据 mTopLayout.setVisibility(View.VISIBLE); diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml index fb62717df6..deeae6aa1c 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml @@ -11,7 +11,7 @@ android:id="@+id/layout_top" android:layout_width="match_parent" android:layout_height="35px" - android:visibility="visible"> + android:visibility="gone"> @@ -92,7 +93,7 @@ android:layout_marginTop="1px" android:gravity="center_horizontal" android:text="你可以试着分享一个事件给其他车主" - android:textColor="@color/transparent_white_30" + android:textColor="@color/white" android:textSize="18px" android:textStyle="bold" /> @@ -127,6 +128,14 @@ + + + From 93b7fe964182b80272dc7ba29e5b7d8f485209a5 Mon Sep 17 00:00:00 2001 From: liujing Date: Thu, 13 Aug 2020 13:25:42 +0800 Subject: [PATCH 07/11] =?UTF-8?q?[add]=20=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E4=B8=ADview?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v2x/fragment/V2XShareEventsFragment.java | 61 +++++------------ .../v2x/view/V2XNetworkLoadingView.java | 66 +++++++++++++++++++ .../module_v2x_event_share_description.xml | 3 +- .../module_v2x_event_share_recylerview.xml | 31 ++++----- .../res/layout/v2x_network_loading_item.xml | 35 ++++++++++ 5 files changed, 133 insertions(+), 63 deletions(-) create mode 100644 modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java create mode 100644 modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java index 69275306fd..d93570ae25 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java @@ -5,8 +5,6 @@ import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.Button; -import android.widget.ImageView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -24,11 +22,10 @@ import com.mogo.module.v2x.listener.AdapterCallback; import com.mogo.module.v2x.network.V2XRefreshCallback; import com.mogo.module.v2x.network.V2XShareNetworkModel; import com.mogo.module.v2x.presenter.ShareEventsPresenter; -import com.mogo.module.v2x.utils.animation.V2XAnimationManager; -import com.mogo.module.v2x.utils.animation.AnimationResources; +import com.mogo.module.v2x.view.V2XNetworkLoadingView; +import com.mogo.utils.CheckUtils; import java.util.ArrayList; -import java.util.concurrent.CountDownLatch; public class V2XShareEventsFragment extends MvpFragment implements AdapterCallback { @@ -37,13 +34,10 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba private V2XShareEventAdapter adapter; private ArrayList dataArrayList = new ArrayList(); private int pageNum = 1; - final CountDownLatch countDownLatch = new CountDownLatch(1); private V2XShareNetworkModel v2XShareNetworkModel; //动画 - private ImageView loadingImageView; - private V2XAnimationManager v2XAnimationManager; - private Button reloadBUtton; + private V2XNetworkLoadingView loadingView; @Override protected int getLayoutId() { @@ -53,7 +47,6 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba @Override protected void initViews() { v2XShareNetworkModel = new V2XShareNetworkModel(getContext()); - v2XAnimationManager = new V2XAnimationManager(); initRecyclerView(); initData(); } @@ -72,11 +65,11 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getActivity(), LinearLayoutManager.VERTICAL, false); recyclerView.setLayoutManager(linearLayoutManager); + loadingView = mRootView.findViewById(R.id.network_loading_imageview); } private void initData() { - loadingImageView = mRootView.findViewById(R.id.loading_imageview); - v2XAnimationManager.animationWithTarget(loadingImageView, AnimationResources.loadingRes, 100); + loadingView.start(); getShareEventResponse(); } @@ -84,6 +77,9 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba * 获取热心指数,分享列表等分享内容 * */ private void getShareEventResponse() { + if (CheckUtils.isNetworkConnected(getContext()) == false) { + Log.d(TAG, "网络异常"); + } v2XShareNetworkModel.getShareEventResponse(pageNum, 10, new V2XRefreshCallback() { @Override public void onSuccess(Object result) { @@ -102,7 +98,7 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba @Override public void onFail(String msg) { - loadingError(true); +// loadingError(true); } }); @@ -148,40 +144,17 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba dataArrayList.add(item); } adapter.notifyDataSetChanged(); - v2XAnimationManager.stop(); + animatioonAcction(View.INVISIBLE); } - /* - * error界面 - * */ - private void loadingError(boolean error) { - reloadBUtton = mRootView.findViewById(R.id.loading_error); - if (error) { - reloadBUtton.setVisibility(View.VISIBLE); - reloadBUtton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - v2XShareNetworkModel.getShareEventList(pageNum, 10, new V2XRefreshCallback() { - @Override - public void onSuccess(Object result) { - loadSuccessWithShareEventList(result); - } - - @Override - public void onFail(String msg) { - - } - }); - reloadBUtton.setVisibility(View.INVISIBLE); - } - }); + private void animatioonAcction(int visible) { + if (visible == View.VISIBLE) { + loadingView.start(); } else { - + loadingView.stop(); } - v2XAnimationManager.stop(); } - @NonNull @Override protected ShareEventsPresenter createPresenter() { @@ -191,9 +164,9 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba @Override public void loadMoreShareEventList() { - Log.d(TAG,"page--"+pageNum); - v2XAnimationManager.start(); - pageNum+=1; + Log.d(TAG, "page--" + pageNum); + animatioonAcction(View.VISIBLE); + pageNum += 1; v2XShareNetworkModel.getShareEventList(pageNum, 10, new V2XRefreshCallback() { @Override public void onSuccess(Object result) { diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java new file mode 100644 index 0000000000..4e2d5a3723 --- /dev/null +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java @@ -0,0 +1,66 @@ +package com.mogo.module.v2x.view; + +import android.content.Context; +import android.util.AttributeSet; +import android.view.LayoutInflater; +import android.widget.ImageView; +import android.widget.RelativeLayout; +import android.widget.TextView; +import androidx.annotation.Nullable; +import com.mogo.module.v2x.R; +import com.mogo.module.v2x.utils.animation.AnimationResources; +import com.mogo.module.v2x.utils.animation.V2XAnimationManager; + +public class V2XNetworkLoadingView extends RelativeLayout { + + private ImageView loadView; + private TextView textView; + private V2XAnimationManager v2XAnimationManager; + + + public V2XNetworkLoadingView(Context context) { + + super(context); + } + + public V2XNetworkLoadingView(Context context, @Nullable AttributeSet attrs) { + super(context, attrs); + LayoutInflater.from(context).inflate(R.layout.v2x_network_loading_item, this); + initView(); + setLoadingImage(AnimationResources.loadingRes); + } + + public V2XNetworkLoadingView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + } + + public void initView() { + v2XAnimationManager = new V2XAnimationManager(); + loadView = findViewById(R.id.loading_imageview); + textView = findViewById(R.id.loading_text); + } + + public void setLoadingText(String text) { + if (textView != null) { + textView.setText(text); + } + } + + public void setLoadingImage(int[] resources) { + v2XAnimationManager.animationWithTarget(loadView, resources, 100); + } + + public void start() { + if (v2XAnimationManager != null) { + v2XAnimationManager.start(); + } + } + + public void stop() { + if (v2XAnimationManager != null) { + v2XAnimationManager.stop(); + } + } + + +} diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml index 941581c18a..cfe8dcfd4b 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml @@ -85,7 +85,8 @@ android:gravity="center_horizontal|top" android:text="车友认同次数" android:textColor="#FFFFFF" - android:textSize="16px"/> + android:textSize="16px" + android:paddingBottom="22px"/> diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_recylerview.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_recylerview.xml index 545abf7aaa..5a711dd9dc 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_recylerview.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_recylerview.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="match_parent" > + android:layout_height="match_parent"> - + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"> - + - - + + diff --git a/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml b/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml new file mode 100644 index 0000000000..f5a420b515 --- /dev/null +++ b/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + \ No newline at end of file From 44f491d28c8f6a735b6ee9ffe493f1edb3432dd1 Mon Sep 17 00:00:00 2001 From: liujing Date: Thu, 13 Aug 2020 13:39:52 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E6=95=B4=E4=B8=AA=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89view=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java index 4e2d5a3723..40714ec11e 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java @@ -3,6 +3,7 @@ package com.mogo.module.v2x.view; import android.content.Context; import android.util.AttributeSet; import android.view.LayoutInflater; +import android.view.View; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; @@ -53,12 +54,14 @@ public class V2XNetworkLoadingView extends RelativeLayout { public void start() { if (v2XAnimationManager != null) { v2XAnimationManager.start(); + this.setVisibility(View.VISIBLE); } } public void stop() { if (v2XAnimationManager != null) { v2XAnimationManager.stop(); + this.setVisibility(GONE); } } From beef3621e12dc3616a58cedbf7199bc5001c7ee5 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Thu, 13 Aug 2020 14:39:13 +0800 Subject: [PATCH 09/11] opt ui --- .../v2x/fragment/V2XShareEventsFragment.java | 2 + .../v2x/fragment/V2XSurroundingFragment.java | 53 ++++++++++++++- .../scene/road/V2XRoadEventScenario.java | 12 ++-- ...odule_event_panel_fragment_surrounding.xml | 67 +++++++++---------- ...module_fragment_surrounding_event_item.xml | 22 +++--- .../src/main/res/values-xhdpi/dimens.xml | 25 +++++++ 6 files changed, 127 insertions(+), 54 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java index d93570ae25..f88e6f5fb0 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java @@ -100,6 +100,8 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba public void onFail(String msg) { // loadingError(true); } + + }); } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java index 17d4904862..767fa9cf60 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java @@ -50,6 +50,7 @@ import com.mogo.utils.logger.Logger; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -165,6 +166,7 @@ public class V2XSurroundingFragment extends MvpFragment exploreWayList) { mV2XAnimationManager.stop(); + mloadingImage.setVisibility(View.GONE); if (exploreWayList != null && exploreWayList.size() > 0) { //展示数据 mTopLayout.setVisibility(View.VISIBLE); @@ -211,10 +213,55 @@ public class V2XSurroundingFragment extends MvpFragment handleMapToList(Map map) { Collection valueCollection = map.values(); - List valueList = new ArrayList<>(valueCollection); + List list = new ArrayList<>(valueCollection); + List resultSurroundingList = new ArrayList<>(); + List outSurroundingList = new ArrayList<>(); - Log.d(TAG, "handleMapToList valueList.size() = " + valueList.size()); - return valueList; + if (list != null && list.size() > 0) { + List prioritySorts = prioritySort(); + for (String poiType : prioritySorts) { + for (SurroundingConstruction construction : list) { + if (!prioritySorts.contains(construction.getPoiType())) { + outSurroundingList.add(construction); + continue; + } else if (poiType.equals(construction.getPoiType())) { + resultSurroundingList.add(construction); + } + } + } + } + + if (outSurroundingList != null && outSurroundingList.size() > 0) { + resultSurroundingList.addAll(outSurroundingList); + } + + Log.d(TAG, "handleMapToList resultSurroundingList.size() = " + resultSurroundingList.size()); + return resultSurroundingList; + } + + public static List prioritySort() { + List poiTypes = new LinkedList<>(); + + // 封路 + poiTypes.add("10003"); + // 结冰 + poiTypes.add("10011"); + // 浓雾 + poiTypes.add("10010"); + // 交通检查 + poiTypes.add("10002"); + // 交通事故 + poiTypes.add("10013"); + // 拥堵 + poiTypes.add("10007"); + // 道路施工 + poiTypes.add("10006"); + // 积水 + poiTypes.add("10008"); + //实时路况 + poiTypes.add("10015"); + + return poiTypes; } /** diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java index 52ef87731e..a2d89e3cba 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java @@ -62,12 +62,12 @@ public class V2XRoadEventScenario extends AbsV2XScenario imp V2XRoadEventEntity v2XRoadEventEntity = v2XMessageEntity.getContent(); if (v2XRoadEventEntity != null) { //只上报事故 - if (v2XRoadEventEntity.getPoiType() != null && v2XRoadEventEntity.getPoiType().equals(MarkerPoiTypeEnum.FOURS_ACCIDENT)) { -// V2XServiceManager.getMoGoStatusManager().setUploadingStatus(ServiceConst.CARD_TYPE_ROAD_CONDITION, true); - TanluUploadParams params = new TanluUploadParams(v2XRoadEventEntity.getPoiType(), - IMogoTanluProvider.UPLOAD_FROM_STRATEGY_ACCIDENT_AUTO); - V2XServiceManager.getTanluManager().uploadRoadCondition(params); - } +// if (v2XRoadEventEntity.getPoiType() != null && v2XRoadEventEntity.getPoiType().equals(MarkerPoiTypeEnum.FOURS_ACCIDENT)) { +//// V2XServiceManager.getMoGoStatusManager().setUploadingStatus(ServiceConst.CARD_TYPE_ROAD_CONDITION, true); +// TanluUploadParams params = new TanluUploadParams(v2XRoadEventEntity.getPoiType(), +// IMogoTanluProvider.UPLOAD_FROM_STRATEGY_ACCIDENT_AUTO); +// V2XServiceManager.getTanluManager().uploadRoadCondition(params); +// } if (v2XMessageEntity.isShowState()) { if (!isSameScenario(v2XMessageEntity)) { diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml index deeae6aa1c..1ce8a4fed9 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml @@ -10,30 +10,30 @@ + android:textColor="@color/white" + android:textSize="@dimen/module_v2x_surrounding_top_textsize" /> @@ -42,11 +42,11 @@ android:id="@+id/list_layout_container" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginTop="15px" - android:layout_marginLeft="10px" - android:layout_marginRight="10px" - android:layout_marginBottom="20px" - android:layout_below="@+id/layout_top"> + android:layout_below="@+id/layout_top" + android:layout_marginLeft="@dimen/module_v2x_surrounding_root_margin_left" + android:layout_marginTop="@dimen/module_v2x_surrounding_empty_tv_margin_top" + android:layout_marginRight="@dimen/module_v2x_surrounding_root_margin_left" + android:layout_marginBottom="@dimen/module_v2x_surrounding_margin_left"> - + android:layout_width="200px" + android:layout_height="200px" + android:layout_centerInParent="true" + android:visibility="gone"/> diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_fragment_surrounding_event_item.xml b/modules/mogo-module-v2x/src/main/res/layout/module_fragment_surrounding_event_item.xml index f40530bbef..407831ac28 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_fragment_surrounding_event_item.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_fragment_surrounding_event_item.xml @@ -2,25 +2,25 @@ + android:layout_height="@dimen/module_v2x_surrounding_item_height"> + android:layout_height="@dimen/module_v2x_surrounding_item_image_height" /> + android:layout_height="@dimen/module_v2x_surrounding_item_bottom"> @@ -31,8 +31,8 @@ android:layout_height="match_parent" android:gravity="center_vertical" android:layout_toRightOf="@+id/iv_event_type" - android:layout_marginLeft="8px" - android:textSize="20px" + android:layout_marginLeft="@dimen/module_v2x_surrounding_item_marigin_bottom_left" + android:textSize="@dimen/module_v2x_surrounding_item_bottom_left_textsize" android:textColor="@color/white" android:text="求助" /> @@ -41,9 +41,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentRight="true" - android:layout_marginRight="12px" + android:layout_marginRight="@dimen/module_v2x_surrounding_item_marigin_left" android:layout_centerVertical="true" - android:textSize="16px" + android:textSize="@dimen/module_v2x_surrounding_item_bottom_right_textsize" android:textColor="@color/transparent_white_30" android:text="23条" /> 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 b063c2f4ef..805256bb01 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 @@ -30,4 +30,29 @@ 200px 100px + 35px + 90px + 36px + 58px + 15px + 150px + 48px + 32px + 70px + 10px + 20px + 200px + + 173px + 130px + 43px + 26px + 12px + 8px + + 18px + 20px + 16px + + From 57bc9af0f8fe1bf15a803f3f1492fa81b2510972 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Thu, 13 Aug 2020 14:47:54 +0800 Subject: [PATCH 10/11] opt --- .../v2x/fragment/V2XSurroundingFragment.java | 4 +-- .../res/values-xhdpi-1920x1000/dimens.xml | 28 +++++++++++++++++++ .../src/main/res/values-xhdpi/dimens.xml | 2 -- .../src/main/res/values/dimens.xml | 22 ++++++++++++++- 4 files changed, 51 insertions(+), 5 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java index 767fa9cf60..e5582f2c05 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java @@ -110,7 +110,7 @@ public class V2XSurroundingFragment extends MvpFragment exploreWayList) { - Logger.e(TAG, "showBonndsRoadtion exploreWayList.size() = " + exploreWayList.size()); + Logger.d(TAG, "showBonndsRoadtion exploreWayList.size() = " + exploreWayList.size()); Rect rect = new Rect( (int) getContext().getResources().getDimension(R.dimen.module_v2x_map_left), (int) getContext().getResources().getDimension(R.dimen.module_v2x_map_top), 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 a61984016d..4cc8c6de38 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 @@ -23,4 +23,32 @@ 80px + 6px + 550px + 200px + 200px + 100px + 35px + 90px + 36px + 58px + 15px + 150px + 48px + 32px + 70px + 10px + 20px + 200px + 173px + 130px + 43px + 26px + 12px + 8px + + 18px + 20px + 16px + 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 805256bb01..517b992d18 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 @@ -29,7 +29,6 @@ 200px 200px 100px - 35px 90px 36px @@ -42,7 +41,6 @@ 10px 20px 200px - 173px 130px 43px 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 831b055b8d..a853afdff8 100644 --- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml @@ -26,11 +26,31 @@ 40px 6px - 16px 550px 200px 200px 100px + 35px + 90px + 36px + 58px + 15px + 150px + 48px + 32px + 70px + 10px + 20px + 200px + 173px + 130px + 43px + 26px + 12px + 8px + 18px + 20px + 16px From 976de0035b73952d9dd9307004d83e1095c345bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Thu, 13 Aug 2020 15:13:39 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=91=A8?= =?UTF-8?q?=E8=BE=B9=E4=BA=8B=E4=BB=B6=E7=BB=98=E5=88=B6=E5=90=8E=E7=9A=84?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E4=BA=8B=E4=BB=B6=E8=A2=AB=E5=93=8D=E5=BA=94?= =?UTF-8?q?=E4=B8=BA=E4=BA=86V2X=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/map/marker/IMogoMarkerClickListener.java | 2 +- .../com/mogo/module/v2x/fragment/V2XSurroundingFragment.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarkerClickListener.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarkerClickListener.java index 966ca196fa..520afe9932 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarkerClickListener.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarkerClickListener.java @@ -12,7 +12,7 @@ public interface IMogoMarkerClickListener { * 事件是否继续往下传递 * * @param marker - * @return true - 时间已经处理完毕不继续往下传，否则继续往下传 + * @return true - 事件已经处理完毕不继续往下传，否则继续往下传 */ boolean onMarkerClicked( IMogoMarker marker ); } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java index e5582f2c05..be559a2494 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java @@ -55,7 +55,6 @@ import java.util.List; import java.util.Map; import static android.view.View.OVER_SCROLL_NEVER; -import static com.mogo.module.v2x.V2XConst.MODULE_NAME; /** * 周边事件 @@ -312,7 +311,7 @@ public class V2XSurroundingFragment extends MvpFragment