diff --git a/config.gradle b/config.gradle index cb393debf5..498afc9c99 100644 --- a/config.gradle +++ b/config.gradle @@ -5,7 +5,7 @@ ext { buildToolsVersion: "29.0.2", minSdkVersion : 19, targetSdkVersion : 22, - versionCode : 2, + versionCode : 3, versionName : "1.0.2", ] diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/WorkThreadHandler.java b/foudations/mogo-utils/src/main/java/com/mogo/utils/WorkThreadHandler.java new file mode 100644 index 0000000000..cb4f6a2c86 --- /dev/null +++ b/foudations/mogo-utils/src/main/java/com/mogo/utils/WorkThreadHandler.java @@ -0,0 +1,65 @@ +package com.mogo.utils; + +import android.os.Handler; +import android.os.HandlerThread; + +/** + * @author congtaowang + * @since 2020-03-23 + *

+ * 描述 + */ +public class WorkThreadHandler { + + private Handler mHandler; + private HandlerThread mThread; + + private WorkThreadHandler() { + // private constructor + mThread = new HandlerThread( "work-thread-handler" ); + mThread.start(); + mHandler = new Handler( mThread.getLooper() ); + } + + private static final class InstanceHolder { + private static final WorkThreadHandler INSTANCE = new WorkThreadHandler(); + } + + public static WorkThreadHandler getInstance() { + return InstanceHolder.INSTANCE; + } + + private Object readResolve() { + // 阻止反序列化,必须实现 Serializable 接口 + return InstanceHolder.INSTANCE; + } + + private Object sToken = new Object(); + + public boolean post( Runnable r ) { + return mHandler != null && mHandler.post( r ); + } + + public boolean postDelayed(Runnable r, long delayMillis ) { + return mHandler != null && mHandler.postDelayed( r, delayMillis ); + } + + public Handler getWorkThreadHandler() { + return mHandler; + } + + public boolean postOnceDelayed(Runnable r, long delayMillis ) { + if ( mHandler == null ) { + return false; + } else { + mHandler.removeCallbacks( r, sToken ); + return mHandler.postDelayed( r, delayMillis ); + } + } + + public void removeCallbacks( Runnable runnable ) { + if ( mHandler != null ) { + mHandler.removeCallbacks( runnable ); + } + } +} diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerInfoView.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerInfoView.java index 00762b3751..7e59c35e56 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerInfoView.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerInfoView.java @@ -153,8 +153,8 @@ public class MapMarkerInfoView extends MapMarkerBaseView { break; case MarkerPoiTypeEnum.FOURS_FOG: ivIcon.setImageResource(R.drawable.module_service_ic_rc_dark_frog2); - clMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_blue_info); - ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_blue); + clMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_grey_info); + ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_grey); break; case MarkerPoiTypeEnum.FOURS_ICE: ivIcon.setImageResource(R.drawable.module_service_ic_rc_freeze2); @@ -163,13 +163,13 @@ public class MapMarkerInfoView extends MapMarkerBaseView { break; case MarkerPoiTypeEnum.FOURS_PARKING: ivIcon.setImageResource(R.drawable.module_service_ic_rc_parking2); - clMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_blue_info); - ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_blue); + clMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_dark_blue_info); + ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_dark_blue); break; case MarkerPoiTypeEnum.FOURS_ACCIDENT: ivIcon.setImageResource(R.drawable.module_service_ic_rc_accident2); - clMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_blue_info); - ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_blue); + clMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_red_info); + ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_red); break; default: ivIcon.setImageResource(R.drawable.icon_map_marker_shear_news); diff --git a/modules/mogo-module-service/src/main/res/drawable/bg_map_marker_grey_info.xml b/modules/mogo-module-service/src/main/res/drawable/bg_map_marker_grey_info.xml new file mode 100644 index 0000000000..12bf9d1551 --- /dev/null +++ b/modules/mogo-module-service/src/main/res/drawable/bg_map_marker_grey_info.xml @@ -0,0 +1,15 @@ + + + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_grey.xml b/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_grey.xml new file mode 100644 index 0000000000..67f37a98a6 --- /dev/null +++ b/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_grey.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + +