diff --git a/.idea/misc.xml b/.idea/misc.xml index 8a8f75bfe2..703e5d4b89 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -5,7 +5,7 @@ - + diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerLocation.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerLocation.java index 466becae24..38715c15aa 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerLocation.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerLocation.java @@ -8,7 +8,7 @@ import java.io.Serializable; public class MarkerLocation implements Serializable { private String address; - private Double angle; + private float angle; private Double lat; private Double lon; @@ -20,11 +20,11 @@ public class MarkerLocation implements Serializable { this.address = address; } - public Double getAngle() { + public float getAngle() { return angle; } - public void setAngle(Double angle) { + public void setAngle(float angle) { this.angle = angle; } diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerShowEntity.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerShowEntity.java index 086d4e7fc4..1572906b37 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerShowEntity.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerShowEntity.java @@ -1,5 +1,7 @@ package com.mogo.module.common.entity; +import java.util.Objects; + /** * author : donghongyu * e-mail : 1358506549@qq.com @@ -73,6 +75,19 @@ public class MarkerShowEntity { this.markerLocation = markerLocation; } + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + MarkerShowEntity that = (MarkerShowEntity) o; + return bindObj.equals(that.bindObj); + } + + @Override + public int hashCode() { + return Objects.hash(bindObj); + } + @Override public String toString() { return "MarkerShowEntity{" + diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerUserInfo.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerUserInfo.java index d596c0ec55..d1c4f79a1c 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerUserInfo.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerUserInfo.java @@ -2,23 +2,25 @@ package com.mogo.module.common.entity; +import android.text.TextUtils; + import java.io.Serializable; import java.util.Calendar; @SuppressWarnings("unused") public class MarkerUserInfo implements Serializable { - + private int age; - + private String gender; - + private String sn; - + private String userHead; - + private Long userId; - + private String userName; public String getAge() { @@ -75,6 +77,17 @@ public class MarkerUserInfo implements Serializable { this.age = age; } + public int getGenderValue() { + if (!TextUtils.isEmpty(gender)) { + if ("男".equals(gender)) { + return 0; + } + return 1; + } else { + return 0; + } + } + public String getGender() { return gender; } diff --git a/modules/mogo-module-common/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-common/src/main/res/values-ldpi/dimens.xml index 1e7b7a3622..5ead382602 100644 --- a/modules/mogo-module-common/src/main/res/values-ldpi/dimens.xml +++ b/modules/mogo-module-common/src/main/res/values-ldpi/dimens.xml @@ -1013,6 +1013,8 @@ 498.5000px 499.0000px 499.5000px + 650.0000px + 3.0000px 3.5000px 4.0000px 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 969c397a02..d56caf71d6 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 @@ -1016,6 +1016,7 @@ 997px 998px 999px + 1300px 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 969c397a02..d56caf71d6 100644 --- a/modules/mogo-module-common/src/main/res/values/dimens.xml +++ b/modules/mogo-module-common/src/main/res/values/dimens.xml @@ -1016,6 +1016,7 @@ 997px 998px 999px + 1300px diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java index f160f2debc..d992f31ca6 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java @@ -19,7 +19,6 @@ import com.mogo.module.common.entity.MarkerResponse; import com.mogo.module.common.entity.MarkerShareMusic; import com.mogo.module.common.entity.MarkerShowEntity; import com.mogo.module.service.marker.MapMarkerAdapter; -import com.mogo.module.service.marker.MapMarkerView; import com.mogo.service.MogoServicePaths; import com.mogo.service.connection.IMogoOnMessageListener; import com.mogo.service.connection.IMogoSocketManager; @@ -29,7 +28,6 @@ import com.mogo.service.statusmanager.IMogoStatusManager; import com.mogo.utils.logger.Logger; import java.util.List; -import java.util.Random; /** * author : donghongyu @@ -122,22 +120,34 @@ public class MarkerServiceHandler { @Override public boolean onMarkerClicked(IMogoMarker marker) { - Logger.e(TAG, "点击了大而全中的Marker"); + Logger.e(TAG, "onMarkerClicked 点击了大而全中的Marker：" + marker); if (lastMarker != null) { - // 设置未选中状态 - MarkerShowEntity markerShowEntity = (MarkerShowEntity) marker.getObject(); - markerShowEntity.setChecked(false); - drawMapMarker(markerShowEntity); + // 判断点击的是否是同一个 + if (marker.equals(lastMarker)) { + Logger.w(TAG, "onMarkerClicked 与上一次点击的Marker一样，不做处理：" + marker); + return false; + } - lastMarker.destroy(); + // 将上次选中 Marker 设置为未选中状态 + MarkerShowEntity lastMarkerShowEntity = (MarkerShowEntity) lastMarker.getObject(); + + Logger.e(TAG, "onMarkerClicked 点击了大而全中的Marker lastMarkerShowEntity：" + lastMarkerShowEntity); + + lastMarkerShowEntity.setChecked(false); + drawMapMarker(lastMarkerShowEntity); + + lastMarker.remove(); } - // 绘制选中的状态 + // 将当前的Marker设置为选中 MarkerShowEntity markerShowEntity = (MarkerShowEntity) marker.getObject(); + Logger.e(TAG, "onMarkerClicked 点击了大而全中的Marker markerShowEntity：" + markerShowEntity); + markerShowEntity.setChecked(true); + lastMarker = drawMapMarker(markerShowEntity); - marker.destroy(); + marker.remove(); return false; } } @@ -147,6 +157,7 @@ public class MarkerServiceHandler { * 绘制Marker */ public static void drawMapMarker(MarkerResponse response) { + lastMarker = null; getMarkerManager().removeMarkers(); // 解析不同的Marker类型，然后对应的进行绘制 @@ -245,19 +256,19 @@ public class MarkerServiceHandler { //TODO 这里是用来测试的 public static void drawMapMarker() { - Logger.e(TAG, "=====绘制Marker===="); - - MapMarkerView mapMarkerView = new MapMarkerView(mContext); - - MogoMarkerOptions options = new MogoMarkerOptions() - .icon(mapMarkerView) - .owner("CARD_TYPE_USER_DATA") - .latitude(39.574525d + new Random().nextDouble()) - .longitude(116.21733d + new Random().nextDouble()); - IMogoMarker marker = getMarkerManager().addMarker("CARD_TYPE_USER_DATA", options); - marker.setOnMarkerClickListener(mogoMarkerClickListener); - marker.setObject("我是Marker上面绑定的数据"); - - getMapUIController().changeZoom(8); +// Logger.e(TAG, "=====绘制Marker===="); +// +// MapMarkerView mapMarkerView = new MapMarkerView(mContext); +// +// MogoMarkerOptions options = new MogoMarkerOptions() +// .icon(mapMarkerView) +// .owner("CARD_TYPE_USER_DATA") +// .latitude(39.574525d + new Random().nextDouble()) +// .longitude(116.21733d + new Random().nextDouble()); +// IMogoMarker marker = getMarkerManager().addMarker("CARD_TYPE_USER_DATA", options); +// marker.setOnMarkerClickListener(mogoMarkerClickListener); +// marker.setObject("我是Marker上面绑定的数据"); +// +// getMapUIController().changeZoom(8); } } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerAdapter.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerAdapter.java index de17e62502..8c2fe8d16b 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerAdapter.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerAdapter.java @@ -23,13 +23,9 @@ public class MapMarkerAdapter { */ public static View getMarkerView(Context context, MarkerShowEntity markerShowEntity) { if (markerShowEntity.isChecked()) { - MapMarkerInfoView mapMarkerInfoView = new MapMarkerInfoView(context); - mapMarkerInfoView.updateView(markerShowEntity); - return mapMarkerInfoView; + return new MapMarkerInfoView(context, markerShowEntity); } else { - MapMarkerView mapMarkerView = new MapMarkerView(context); - mapMarkerView.updateView(markerShowEntity); - return mapMarkerView; + return new MapMarkerView(context, markerShowEntity); } } } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerBaseView.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerBaseView.java new file mode 100644 index 0000000000..04127ff0f4 --- /dev/null +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerBaseView.java @@ -0,0 +1,83 @@ +package com.mogo.module.service.marker; + +import android.content.Context; +import android.graphics.Bitmap; +import android.text.TextUtils; +import android.util.AttributeSet; +import android.widget.ImageView; + +import androidx.annotation.Nullable; +import androidx.constraintlayout.widget.ConstraintLayout; + +import com.mogo.module.common.entity.MarkerShowEntity; +import com.mogo.module.service.MarkerServiceHandler; +import com.mogo.service.imageloader.IMogoImageLoaderListener; +import com.mogo.service.imageloader.MogoImageView; +import com.mogo.utils.WindowUtils; +import com.mogo.utils.logger.Logger; + +/** + * author : donghongyu + * e-mail : 1358506549@qq.com + * date : 2020-01-1310:55 + * desc : 地图上抽离的Marker的共性 + * version: 1.0 + */ +public abstract class MapMarkerBaseView extends ConstraintLayout { + private String TAG = "MapMarkerBaseView"; + + protected Context mContext; + + protected MogoImageView ivUserHead; + protected ImageView ivIconForeground; + protected ImageView ivCar; + + public MapMarkerBaseView(Context context) { + super(context); + mContext = context; + initView(context); + } + + public MapMarkerBaseView(Context context, @Nullable AttributeSet attrs) { + super(context, attrs); + mContext = context; + initView(context); + } + + public MapMarkerBaseView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + mContext = context; + initView(context); + } + + protected abstract void initView(Context context); + + public abstract void updateView(MarkerShowEntity markerShowEntity); + + protected void loadImageWithMarker(MarkerShowEntity markerShowEntity) { + if (!TextUtils.isEmpty(markerShowEntity.getIconUrl())) { + MarkerServiceHandler + .getImageloader() + .displayImage(markerShowEntity.getIconUrl(), + ivUserHead, + WindowUtils.dip2px(mContext, 50), WindowUtils.dip2px(mContext, 50), + new IMogoImageLoaderListener() { + @Override + public void onStart() { + + } + + @Override + public void onCompleted(Bitmap bitmap) { + // 刷新图标 + Logger.d(TAG, "loaded."); + } + + @Override + public void onFailure(Exception e) { + + } + }); + } + } +} 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 7b8a2daae4..e379d4fc47 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 @@ -1,7 +1,7 @@ package com.mogo.module.service.marker; import android.content.Context; -import android.graphics.Bitmap; +import android.text.TextUtils; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; @@ -11,14 +11,10 @@ import android.widget.TextView; import androidx.annotation.Nullable; import androidx.constraintlayout.widget.ConstraintLayout; +import com.mogo.module.common.entity.MarkerOnlineCar; import com.mogo.module.common.entity.MarkerShowEntity; -import com.mogo.module.service.MarkerServiceHandler; import com.mogo.module.service.R; import com.mogo.module.service.ServiceConst; -import com.mogo.service.imageloader.IMogoImageLoaderListener; -import com.mogo.service.imageloader.MogoImageView; -import com.mogo.utils.WindowUtils; -import com.mogo.utils.logger.Logger; /** * author : donghongyu @@ -27,75 +23,80 @@ import com.mogo.utils.logger.Logger; * desc : 地图Marker图标带文本信息 * version: 1.0 */ -public class MapMarkerInfoView extends ConstraintLayout { +public class MapMarkerInfoView extends MapMarkerBaseView { private String TAG = "MapMarkerInfoView"; - private Context mContext; - - private MogoImageView ivUserHead; - private ImageView ivIconForeground; private TextView tvMarkerContent; + private ConstraintLayout llMarkerContent; + private ImageView ivReverseTriangle; public MapMarkerInfoView(Context context) { super(context); - initView(context); } public MapMarkerInfoView(Context context, @Nullable AttributeSet attrs) { super(context, attrs); - initView(context); } public MapMarkerInfoView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); - initView(context); } - private void initView(Context context) { - mContext = context; + public MapMarkerInfoView(Context context, MarkerShowEntity markerShowEntity) { + super(context); + updateView(markerShowEntity); + } + + protected void initView(Context context) { LayoutInflater.from(context).inflate(R.layout.view_map_marker_info, this); ivUserHead = findViewById(R.id.ivUserHead); ivIconForeground = findViewById(R.id.ivIconForeground); + llMarkerContent = findViewById(R.id.llMarkerContent); + ivReverseTriangle = findViewById(R.id.ivReverseTriangle); + ivCar = findViewById(R.id.ivCar); tvMarkerContent = findViewById(R.id.tvMarkerContent); } public void updateView(MarkerShowEntity markerShowEntity) { try { + + Object bindObj = markerShowEntity.getBindObj(); + switch (markerShowEntity.getMarkerType()) { case ServiceConst .CARD_TYPE_CARS_CHATTING: + ivIconForeground.setVisibility(View.GONE); case ServiceConst .CARD_TYPE_USER_DATA: ivIconForeground.setVisibility(View.GONE); + + if (bindObj instanceof MarkerOnlineCar) { + if (((MarkerOnlineCar) bindObj).getUserInfo().getGenderValue() == 0) { + llMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_blue_info); + ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_blue); + } else { + llMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_purple_info); + ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_purple); + } + } break; case ServiceConst .CARD_TYPE_ROAD_CONDITION: + break; case ServiceConst .CARD_TYPE_SHARE_MUSIC: ivIconForeground.setVisibility(View.VISIBLE); + llMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_purple_info); + ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_purple); break; } - tvMarkerContent.setText(markerShowEntity.getTextContent()); - MarkerServiceHandler - .getImageloader() - .displayImage(markerShowEntity.getIconUrl(), ivUserHead, WindowUtils.dip2px(mContext, 50), WindowUtils.dip2px(mContext, 50), - new IMogoImageLoaderListener() { - @Override - public void onStart() { - } + ivCar.setRotation(markerShowEntity.getMarkerLocation().getAngle()); + if (!TextUtils.isEmpty(markerShowEntity.getTextContent())) { + tvMarkerContent.setText(markerShowEntity.getTextContent()); + } + loadImageWithMarker(markerShowEntity); - @Override - public void onCompleted(Bitmap bitmap) { - // 刷新图标 - Logger.d(TAG, "loaded."); - } - - @Override - public void onFailure(Exception e) { - - } - }); } catch (Exception e) { e.printStackTrace(); } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java index da4c33cdcb..5a4c1e7e42 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java @@ -1,23 +1,17 @@ package com.mogo.module.service.marker; import android.content.Context; -import android.graphics.Bitmap; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; import android.widget.ImageView; import androidx.annotation.Nullable; -import androidx.constraintlayout.widget.ConstraintLayout; +import com.mogo.module.common.entity.MarkerOnlineCar; import com.mogo.module.common.entity.MarkerShowEntity; -import com.mogo.module.service.MarkerServiceHandler; import com.mogo.module.service.R; import com.mogo.module.service.ServiceConst; -import com.mogo.service.imageloader.IMogoImageLoaderListener; -import com.mogo.service.imageloader.MogoImageView; -import com.mogo.utils.WindowUtils; -import com.mogo.utils.logger.Logger; /** * author : donghongyu @@ -26,75 +20,75 @@ import com.mogo.utils.logger.Logger; * desc : 地图Marker图标 * version: 1.0 */ -public class MapMarkerView extends ConstraintLayout { +public class MapMarkerView extends MapMarkerBaseView { private String TAG = "MapMarkerView"; - private Context mContext; - - private MogoImageView ivUserHead; - private ImageView ivIconForeground; + private ImageView ivBg; public MapMarkerView(Context context) { super(context); - initView(context); } public MapMarkerView(Context context, @Nullable AttributeSet attrs) { super(context, attrs); - initView(context); } public MapMarkerView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); - initView(context); } + public MapMarkerView(Context context, MarkerShowEntity markerShowEntity) { + super(context); + updateView(markerShowEntity); + } + + protected void initView(Context context) { + setBackground(null); - private void initView(Context context) { - mContext = context; LayoutInflater.from(context).inflate(R.layout.view_map_marker, this); ivUserHead = findViewById(R.id.ivUserHead); ivIconForeground = findViewById(R.id.ivIconForeground); + ivCar = findViewById(R.id.ivCar); + ivBg = findViewById(R.id.ivBg); } public void updateView(MarkerShowEntity markerShowEntity) { try { + Object bindObj = markerShowEntity.getBindObj(); + switch (markerShowEntity.getMarkerType()) { case ServiceConst .CARD_TYPE_CARS_CHATTING: + ivIconForeground.setVisibility(View.GONE); case ServiceConst .CARD_TYPE_USER_DATA: ivIconForeground.setVisibility(View.GONE); + + if (bindObj instanceof MarkerOnlineCar) { + if (((MarkerOnlineCar) bindObj).getUserInfo().getGenderValue() == 0) { + ivBg.setImageResource(R.drawable.bg_map_marker_blue); + } else { + ivBg.setImageResource(R.drawable.bg_map_marker_purple); + } + } break; case ServiceConst .CARD_TYPE_ROAD_CONDITION: + break; case ServiceConst .CARD_TYPE_SHARE_MUSIC: ivIconForeground.setVisibility(View.VISIBLE); + ivBg.setImageResource(R.drawable.bg_map_marker_purple); break; } - MarkerServiceHandler - .getImageloader() - .displayImage(markerShowEntity.getIconUrl(), ivUserHead, WindowUtils.dip2px(mContext, 50), WindowUtils.dip2px(mContext, 50), - new IMogoImageLoaderListener() { - @Override - public void onStart() { + ivCar.setRotation(markerShowEntity.getMarkerLocation().getAngle()); - } + loadImageWithMarker(markerShowEntity); - @Override - public void onCompleted(Bitmap bitmap) { - // 刷新图标 - Logger.d(TAG, "loaded."); - } - - @Override - public void onFailure(Exception e) { - - } - }); } catch (Exception e) { e.printStackTrace(); } } + + } \ No newline at end of file diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_listen.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_listen.png index a2b097eb26..f846dcefc3 100644 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_listen.png and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_listen.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_misic.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_misic.png index eac62954aa..b0dc73d75a 100644 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_misic.png and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_misic.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_news.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_news.png index a832ba97e2..26edaa7f7a 100644 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_news.png and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_news.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_refuel.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_refuel.png new file mode 100644 index 0000000000..bac7ee2e40 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_refuel.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_block_off.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_block_off.png new file mode 100644 index 0000000000..8c6b30842b Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_block_off.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up.png new file mode 100644 index 0000000000..cbe3fe5b66 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_check.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_check.png new file mode 100644 index 0000000000..1a86fe5896 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_check.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable/bg_map_marker_dark_blue_info.xml b/modules/mogo-module-service/src/main/res/drawable/bg_map_marker_dark_blue_info.xml new file mode 100644 index 0000000000..8b02f55024 --- /dev/null +++ b/modules/mogo-module-service/src/main/res/drawable/bg_map_marker_dark_blue_info.xml @@ -0,0 +1,15 @@ + + + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-service/src/main/res/drawable/bg_map_marker_orange_info.xml b/modules/mogo-module-service/src/main/res/drawable/bg_map_marker_orange_info.xml new file mode 100644 index 0000000000..2ba73d956c --- /dev/null +++ b/modules/mogo-module-service/src/main/res/drawable/bg_map_marker_orange_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_orange_green.xml b/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_orange_green.xml new file mode 100644 index 0000000000..0755b4631d --- /dev/null +++ b/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_orange_green.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + diff --git a/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_dark_blue.xml b/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_dark_blue.xml new file mode 100644 index 0000000000..6f7c6801d3 --- /dev/null +++ b/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_dark_blue.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + diff --git a/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_purple.xml b/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_purple.xml index 125579bde5..5c01ecf42a 100644 --- a/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_purple.xml +++ b/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_purple.xml @@ -8,7 +8,7 @@ android:pivotY="15%" android:toDegrees="45" > - + diff --git a/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml b/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml index 45ce46a8a8..eabc960031 100644 --- a/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml +++ b/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml @@ -11,7 +11,6 @@ android:id="@+id/ivCar" android:layout_width="@dimen/dp_34" android:layout_height="@dimen/dp_64" - android:rotation="270" android:src="@drawable/icon_map_marker_car_blue" android:translationY="-5dp" app:layout_constraintEnd_toEndOf="@+id/ivBg" diff --git a/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml b/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml index c61305a92b..ecf4962bda 100644 --- a/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml +++ b/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml @@ -12,7 +12,6 @@ android:id="@+id/ivCar" android:layout_width="@dimen/dp_34" android:layout_height="@dimen/dp_64" - android:rotation="270" android:src="@drawable/icon_map_marker_car_blue" android:translationY="-5dp" app:layout_constraintEnd_toEndOf="@+id/ivReverseTriangle" @@ -44,13 +43,13 @@ android:id="@+id/ivIconForeground" android:layout_width="@dimen/dp_56" android:layout_height="@dimen/dp_56" - android:visibility="gone" - tools:visibility="visible" android:layout_gravity="center" android:layout_marginTop="@dimen/dp_6" android:src="@drawable/icon_map_marker_music_play" + android:visibility="gone" app:layout_constraintStart_toStartOf="@+id/ivUserHead" - app:layout_constraintTop_toTopOf="@+id/ivUserHead" /> + app:layout_constraintTop_toTopOf="@+id/ivUserHead" + tools:visibility="visible" /> + app:layout_constraintTop_toTopOf="@+id/ivUserHead" + tools:text="诗一样的女子" /> diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java index 4d3ad002d3..45a61266fc 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java @@ -5,11 +5,10 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.view.View; -import android.widget.ImageView; +import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.NonNull; - import com.mogo.module.share.R; import com.mogo.utils.logger.Logger; @@ -21,7 +20,10 @@ import com.mogo.utils.logger.Logger; */ public class LaucherShareDialog extends Dialog implements View.OnClickListener { private TextView txtOk; - private ImageView mBackImage; + private RelativeLayout mBlockLayout; + private RelativeLayout mOilPriceLayout; + private RelativeLayout mTrafficCheckLayout; + private RelativeLayout mRoadClosureLayout; private Context mContext; @@ -44,22 +46,38 @@ public class LaucherShareDialog extends Dialog implements View.OnClickListener { private void initView() { setContentView(R.layout.launcher_dialog_share); txtOk = findViewById(R.id.btn_share_title); - mBackImage = findViewById(R.id.btn_back); + mBlockLayout = findViewById(R.id.btn_block_layout); + mOilPriceLayout = findViewById(R.id.oil_price_layout); + mTrafficCheckLayout = findViewById(R.id.traffic_check_layout); + mRoadClosureLayout = findViewById(R.id.road_closure_layout); } - private void initListener() { - mBackImage.setOnClickListener(this); + private void initListener() { + mBlockLayout.setOnClickListener(this); + mOilPriceLayout.setOnClickListener(this); + mTrafficCheckLayout.setOnClickListener(this); + mRoadClosureLayout.setOnClickListener(this); } @Override public void onClick(View view) { int id = view.getId(); - if (id == R.id.btn_back) { + if (id == R.id.btn_block_layout) { sendShareReceiver(); - dismiss(); + } else if (id == R.id.oil_price_layout) { + //TODO + + } else if (id == R.id.traffic_check_layout) { + //TODO + + } else if (id == R.id.road_closure_layout) { + //TODO + } + + dismiss(); } /** @@ -70,6 +88,7 @@ public class LaucherShareDialog extends Dialog implements View.OnClickListener { Intent intent = new Intent(); intent.setAction("com.zhidao.roadcondition.share"); intent.putExtra("type", "1"); + intent.putExtra("keyWords", "xx"); mContext.sendBroadcast(intent); } diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi/main_video_play_btn_normal.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/main_video_play_btn_normal.png deleted file mode 100644 index 7db2e805ee..0000000000 Binary files a/modules/mogo-module-share/src/main/res/drawable-xhdpi/main_video_play_btn_normal.png and /dev/null differ diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_block_up.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_block_up.png new file mode 100644 index 0000000000..aa80dfe42f Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_block_up.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_oil_price.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_oil_price.png new file mode 100644 index 0000000000..2d3321bbdc Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_oil_price.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_road_closure.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_road_closure.png new file mode 100644 index 0000000000..7726fc04d4 Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_road_closure.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_traffic_check.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_traffic_check.png new file mode 100644 index 0000000000..18e28e06f7 Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_traffic_check.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable/shape_bg_222533_20px.xml b/modules/mogo-module-share/src/main/res/drawable/shape_bg_222533_20px.xml new file mode 100644 index 0000000000..0fa61ad26e --- /dev/null +++ b/modules/mogo-module-share/src/main/res/drawable/shape_bg_222533_20px.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share.xml b/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share.xml index 0e191c8292..2d9b08d3c1 100644 --- a/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share.xml +++ b/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share.xml @@ -1,41 +1,144 @@ + android:layout_width="@dimen/dp_1300" + android:layout_height="@dimen/dp_600" + android:background="@drawable/shape_bg_222533_20px"> - + android:textSize="@dimen/dp_40" /> + android:layout_height="match_parent" + android:layout_below="@+id/btn_share_title" + android:layout_centerHorizontal="true" + android:layout_marginTop="@dimen/dp_64"> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file diff --git a/modules/mogo-module-share/src/main/res/values/colors.xml b/modules/mogo-module-share/src/main/res/values/colors.xml index 0081f334bf..ebf7824990 100644 --- a/modules/mogo-module-share/src/main/res/values/colors.xml +++ b/modules/mogo-module-share/src/main/res/values/colors.xml @@ -7,6 +7,7 @@ #FF1B1B #FFFFFF #80FFFFFF + #99FFFFFF #F8F8F8 #333333 #DADAE2 @@ -14,5 +15,6 @@ #99191C25 #666666 #999999 + #000000 diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java index cf785b7158..ad854fb698 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java @@ -229,7 +229,7 @@ public class TanluCardViewFragment extends MvpFragment> */ private void handleRoadLineMessage() { mMogoSocketManager = (IMogoSocketManager) ARouter.getInstance().build(MogoServicePaths.PATH_SOCKET_MANAGER).navigation(); - mMogoSocketManager.registerOnMessageListener(1, new IMogoOnMessageListener() { + mMogoSocketManager.registerOnMessageListener(401005, new IMogoOnMessageListener() { @Override public Class target() { return MarkerResponse.class; @@ -237,14 +237,13 @@ public class TanluCardViewFragment extends MvpFragment> @Override public void onMsgReceived(MarkerResponse obj) { - Logger.e(TAG, "onMsgReceived obj= " + obj); + Logger.e(TAG, "handleRoadLineMessage onMsgReceived obj= " + obj); getRoadLineData(); } }); } /** - * TODO * * @param view */