diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt index 205574766b..d7db18d27f 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt @@ -315,7 +315,7 @@ class MainService : Service() { isCustom: Boolean = false, id: Long = 0 ) { - Log.d("MainService", "takeVideo --------1----> fromType = $fromType") + Log.d("MainService", "takeVideo --------1----> fromType = $fromType --isCustom = $isCustom") // if (isAuthorization(BaseApplication.getAppContext())) { CarCorderController.takeVideo(1, duration, isCustom, id, shareType, mainInfoId, fromType, mLongitude, mLatitude, speed) // } diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/map/MyLocationUtil.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/map/MyLocationUtil.java index 347447f467..f3b279d147 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/map/MyLocationUtil.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/map/MyLocationUtil.java @@ -98,7 +98,7 @@ public class MyLocationUtil { throw new IllegalArgumentException("inflate myLocation bitmap can not be null!"); } View root = - LayoutInflater.from(context).inflate(R.layout.module_map_amap_my_location, null, false); + LayoutInflater.from(context).inflate(R.layout.module_common_my_location, null, false); ImageView iv = root.findViewById(R.id.module_map_amap_my_location_iv); iv.setImageBitmap(res); diff --git a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main_no_map.xml b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main_no_map.xml index c69e16a9ab..c88a2f274b 100644 --- a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main_no_map.xml +++ b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main_no_map.xml @@ -36,12 +36,6 @@ android:layout_width="@dimen/module_main_id_left_panel_fragment_container_width" android:layout_height="match_parent" /> - - - + + + { private List markerExploreWays; private Context mContext; - private ImageView mTypeImageView; private TextView mTypeTv; private TextView mAddressTv; + private TextView mUserNameTv; private TextView mTimeTv; + private HeartLikeView mHeartLikeView; + private HeartUnLikeView mUnHeartLikeView; public V2XSurroundingDetailAdapter(Context context, List list) { @@ -57,18 +65,52 @@ public class V2XSurroundingDetailAdapter extends RecyclerView.Adapter { + Logger.d(V2XConst.MODULE_NAME, "反馈有用"); + roadReportTrue(exploreWay); + }); + + mUnHeartLikeView.setOnClickCallListener(v -> { + Logger.d(V2XConst.MODULE_NAME, "反馈无用"); + roadReportErr(exploreWay); + }); } + /** + * 反馈路况正确 + */ + private void roadReportTrue(MarkerExploreWay exploreWay) { + if (exploreWay != null) { + RoadConditionUtils.sendShareReceiverInfo( + exploreWay.getInfoId(), + exploreWay.getPoiType(), + 2); + } + } + + /** + * 反馈路况错误 + */ + private void roadReportErr(MarkerExploreWay exploreWay) { + if (exploreWay != null) { + RoadConditionUtils.sendShareReceiverInfo( + exploreWay.getInfoId(), + exploreWay.getPoiType(), + 3); + } + } @Override public int getItemCount() { @@ -113,4 +155,6 @@ public class V2XSurroundingDetailAdapter extends RecyclerView.Adapter { mAddressTv = itemView.findViewById(R.id.tvAddress); mIllegalNumTv = itemView.findViewById(R.id.tvIllegalNum); mIlIllegalParkingLike = itemView.findViewById(R.id.llIllegalParkingLike); + Drawable drawable = ContextCompat.getDrawable(viewGroup.getContext(), R.drawable.icon_heart_like_bg); + mIlIllegalParkingLike.setBackground(drawable); mIIllegalParkingUnLike = itemView.findViewById(R.id.llIllegalParkingUnLike); // 设置视图状态监听 diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java index 18aeb96303..97fa75bc3a 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java @@ -134,41 +134,46 @@ public class V2XOtherSeekHelpVH extends V2XBaseViewHolder { } catch (Exception e) { e.printStackTrace(); } - ivHead.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - triggerIVReportHead(mNoveltyInfo); - } - }); - // 只有自研车机才会 有车聊聊通话 - if (DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE) { - // 判断是否可以打电话 - ChartingUtil.isCanCall(b -> { - if (b) { - // 判断是否可以打电话 - ChartingUtil.isOnLine(mV2XPushMessageEntity.getSn(), b1 -> { - if (b1) { - ivCall.setVisibility(VISIBLE); - } else { - ivCall.setVisibility(GONE); - } - }); - } else { - ivCall.setVisibility(GONE); + // M1低配车机限制 + // 不展示打电话按钮 + // 不能查看用户详情 + if (DebugConfig.isMapBased()) { + ivHead.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + triggerIVReportHead(mNoveltyInfo); } }); - - ivCall.setOnClickListener(v -> { - V2XServiceManager.getV2XRefreshModel().respondingToHelp(mUserInfo.getSn()); - if (!V2XUtils.isFastClick()) { - try { - triggerCallChart(mNoveltyInfo); - } catch (Exception e) { - e.printStackTrace(); + // 只有自研车机才会 有车聊聊通话 + if (DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE) { + // 判断是否可以打电话 + ChartingUtil.isCanCall(b -> { + if (b) { + // 判断是否可以打电话 + ChartingUtil.isOnLine(mV2XPushMessageEntity.getSn(), b1 -> { + if (b1) { + ivCall.setVisibility(VISIBLE); + } else { + ivCall.setVisibility(GONE); + } + }); + } else { + ivCall.setVisibility(GONE); } - } - }); + }); + + ivCall.setOnClickListener(v -> { + V2XServiceManager.getV2XRefreshModel().respondingToHelp(mUserInfo.getSn()); + if (!V2XUtils.isFastClick()) { + try { + triggerCallChart(mNoveltyInfo); + } catch (Exception e) { + e.printStackTrace(); + } + } + }); + } } try { if (!TextUtils.isEmpty(mV2XPushMessageEntity.getHeadImgUrl())) { diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java index d9448a9c36..ba73a92fc6 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java @@ -1,6 +1,7 @@ package com.mogo.module.v2x.adapter.holder; import android.content.Intent; +import android.graphics.drawable.Drawable; import android.text.TextUtils; import android.util.Log; import android.view.LayoutInflater; @@ -9,6 +10,8 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; +import androidx.core.content.ContextCompat; + import com.mogo.commons.debug.DebugConfig; import com.mogo.module.common.entity.MarkerExploreWay; import com.mogo.module.common.entity.MarkerUserInfo; @@ -133,6 +136,8 @@ public class V2XRoadEventVH extends V2XBaseViewHolder { ivEventLive = itemView.findViewById(R.id.ivEventLive); ivEventCallChart = itemView.findViewById(R.id.ivEventCallChart); ivEventZan = itemView.findViewById(R.id.ivEventZan); + Drawable drawable = ContextCompat.getDrawable(itemView.getContext(), R.drawable.icon_heart_like_bg); + ivEventZan.setBackground(drawable); ivEventReportTrue = itemView.findViewById(R.id.ivEventReportTrue); ivEventReportErr = itemView.findViewById(R.id.ivEventReportErr); } @@ -376,23 +381,28 @@ public class V2XRoadEventVH extends V2XBaseViewHolder { // 重新设置用户信息 mNoveltyInfo.setUserInfo(mUserInfo); - // 只有自研车机才会 有车聊聊通话 - if (DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE) { - // 判断是否可以打电话 - ChartingUtil.isCanCall(b -> { - if (b) { - // 判断是否可以打电话 - ChartingUtil.isOnLine(mUserInfo.getSn(), b1 -> { - if (b1) { - ivEventCallChart.setVisibility(VISIBLE); - } else { - ivEventCallChart.setVisibility(GONE); - } - }); - } else { - ivEventCallChart.setVisibility(GONE); - } - }); + // M1低配车机限制 + // 不展示打电话按钮 + // 不能查看用户详情 + if (DebugConfig.isMapBased()) { + // 只有自研车机才会 有车聊聊通话 + if (DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE) { + // 判断是否可以打电话 + ChartingUtil.isCanCall(b -> { + if (b) { + // 判断是否可以打电话 + ChartingUtil.isOnLine(mUserInfo.getSn(), b1 -> { + if (b1) { + ivEventCallChart.setVisibility(VISIBLE); + } else { + ivEventCallChart.setVisibility(GONE); + } + }); + } else { + ivEventCallChart.setVisibility(GONE); + } + }); + } } } } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryIllegalParkVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryIllegalParkVH.java index e32d6aef52..3998c9a69a 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryIllegalParkVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryIllegalParkVH.java @@ -1,11 +1,14 @@ package com.mogo.module.v2x.adapter.holder; +import android.content.res.TypedArray; +import android.graphics.drawable.Drawable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; import androidx.annotation.NonNull; +import androidx.core.content.ContextCompat; import com.mogo.module.common.entity.MarkerExploreWay; import com.mogo.module.common.entity.V2XHistoryScenarioData; @@ -47,6 +50,8 @@ public class V2XScenarioHistoryIllegalParkVH extends V2XBaseViewHolder { - if (b) { - // 判断是否可以打电话 - ChartingUtil.isOnLine(xPushMessageEntity.getSn(), b1 -> { - if (b1) { - mIvFaultHelpEventCall.setVisibility(VISIBLE); - } else { - mIvFaultHelpEventCall.setVisibility(GONE); - } - }); - } else { - mIvFaultHelpEventCall.setVisibility(GONE); - } - }); - - mIvFaultHelpEventCall.setOnClickListener(v -> { - if (!V2XUtils.isFastClick()) { - V2XServiceManager.getV2XRefreshModel().respondingToHelp(mUserInfo.getSn()); - try { - triggerCallChart(mNoveltyInfo); - } catch (Exception e) { - e.printStackTrace(); + // M1低配车机限制 + // 不展示打电话按钮 + // 不能查看用户详情 + if (DebugConfig.isMapBased()) { + // 只有自研车机才会 有车聊聊通话 + if (DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE) { + // 判断是否可以打电话 + ChartingUtil.isCanCall(b -> { + if (b) { + // 判断是否可以打电话 + ChartingUtil.isOnLine(xPushMessageEntity.getSn(), b1 -> { + if (b1) { + mIvFaultHelpEventCall.setVisibility(VISIBLE); + } else { + mIvFaultHelpEventCall.setVisibility(GONE); + } + }); + } else { + mIvFaultHelpEventCall.setVisibility(GONE); } - } - }); + }); + + mIvFaultHelpEventCall.setOnClickListener(v -> { + if (!V2XUtils.isFastClick()) { + V2XServiceManager.getV2XRefreshModel().respondingToHelp(mUserInfo.getSn()); + try { + triggerCallChart(mNoveltyInfo); + } catch (Exception e) { + e.printStackTrace(); + } + } + }); + } } } catch (Exception e) { e.printStackTrace(); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java index c392ecc22a..420ffb705b 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java @@ -1,5 +1,6 @@ package com.mogo.module.v2x.adapter.holder; +import android.graphics.drawable.Drawable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -7,6 +8,7 @@ import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.NonNull; +import androidx.core.content.ContextCompat; import com.mogo.module.common.entity.MarkerExploreWay; import com.mogo.module.common.entity.V2XHistoryScenarioData; @@ -49,6 +51,8 @@ public class V2XScenarioHistoryRoadEventVH extends V2XBaseViewHolder v2XRoadEventEntityList, MogoLocation currentLocation) { try { - // 检测道路事件是否需UGC问答 - V2XEarlyWarningServer.roadEventUgcCheck(currentLocation); + // M1低配车机限制 + // 不展示UGC问答 + if (DebugConfig.isMapBased()) { + // 检测道路事件是否需UGC问答 + V2XEarlyWarningServer.roadEventUgcCheck(currentLocation); + } // Logger.w(MODULE_NAME, "V2X预警--车辆状态:" + currentLocation); // Logger.w(MODULE_NAME, "V2X预警--车辆速度:" + currentLocation.getSpeed()); // Logger.w(MODULE_NAME, "V2X预警--v2XRoadEventEntityList:" + GsonUtil.jsonFromObject(v2XRoadEventEntityList)); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/HeartLikeView.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/HeartLikeView.java index 817d7c67f6..71f3f204c2 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/HeartLikeView.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/HeartLikeView.java @@ -4,6 +4,8 @@ import android.animation.Animator; import android.animation.AnimatorInflater; import android.animation.AnimatorSet; import android.content.Context; +import android.content.res.TypedArray; +import android.graphics.drawable.Drawable; import android.util.AttributeSet; import android.view.View; import android.widget.ImageView; @@ -23,7 +25,6 @@ public class HeartLikeView extends LinearLayout implements Animator.AnimatorList private ImageView mIllegalParkingLike; private AnimatorSet mAnimatorSet; private OnClickCallListener mOnClickCallListener; - private boolean isAnimator = false; public HeartLikeView(Context context) { diff --git a/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_back_image.png b/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_back_image.png new file mode 100644 index 0000000000..b1752e1069 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_back_image.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_history_heart_back.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_history_heart_back.png new file mode 100644 index 0000000000..e8c003d0ea Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_history_heart_back.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable/bg_fatigue_driving.xml b/modules/mogo-module-v2x/src/main/res/drawable/bg_fatigue_driving.xml new file mode 100644 index 0000000000..a963da5710 --- /dev/null +++ b/modules/mogo-module-v2x/src/main/res/drawable/bg_fatigue_driving.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml index bc25522ee9..451abab86d 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml @@ -194,10 +194,10 @@ - diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml index c61b839713..0f1eaa62f0 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml @@ -88,6 +88,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="@dimen/dp_40" + app:backgroundImg="@drawable/icon_history_heart_back" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/llIllegalParkingUnLike" app:layout_constraintTop_toTopOf="parent" /> diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml index 59251e78da..8d055540e7 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml @@ -97,7 +97,7 @@ android:id="@+id/tvFaultHelpDistance" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/dp_33" + android:layout_marginStart="@dimen/dp_33" android:layout_marginTop="@dimen/dp_5" android:layout_marginEnd="@dimen/dp_30" android:textColor="@color/v2x_FFF_333" @@ -113,6 +113,7 @@ android:layout_height="@dimen/module_v2x_event_button_size" android:layout_marginEnd="@dimen/dp_40" android:src="@drawable/selector_call_btn" + android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/ivFaultHelpEventNavi" app:layout_constraintTop_toTopOf="parent" /> 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 b3ecc8754a..dca25c89b9 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 @@ -167,33 +167,35 @@ + android:layout_width="43px" + android:layout_height="43px"/> + android:textSize="18px" /> - diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_surrounding_detail_item.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_surrounding_detail_item.xml index 075ce59f72..3753401c25 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_surrounding_detail_item.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_surrounding_detail_item.xml @@ -1,53 +1,89 @@ - + android:layout_marginTop="@dimen/dp_24" + android:layout_marginRight="@dimen/dp_30" + android:ellipsize="end" + android:maxLines="1" + android:textColor="@color/v2x_FFF_333" + android:textSize="18px" + android:textStyle="bold" + app:layout_constraintEnd_toStartOf="@+id/surrounding_road_like" + app:layout_constraintStart_toStartOf="@id/surrounding_road_type" + app:layout_constraintTop_toTopOf="parent" + tools:text="小黄庄北街与北三环辅路交叉口小黄庄北街与北三环辅路交叉口" /> + android:alpha="0.6" + android:textColor="@color/v2x_FFF_666" + android:textSize="16px" + android:layout_marginStart="@dimen/dp_36" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/surrounding_road_type_address" + tools:text="赵云" /> - \ No newline at end of file + android:textSize="16px" + android:layout_marginStart="@dimen/dp_80" + app:layout_constraintStart_toStartOf="@+id/surrounding_username" + app:layout_constraintTop_toBottomOf="@+id/surrounding_road_type_address" + tools:text="2020-1-12" /> + + + + + + + + + diff --git a/modules/mogo-module-v2x/src/main/res/layout/view_heart_like.xml b/modules/mogo-module-v2x/src/main/res/layout/view_heart_like.xml index 8080b8a457..9abaf966f6 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/view_heart_like.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/view_heart_like.xml @@ -3,7 +3,6 @@ android:id="@+id/llIllegalParkingLike" android:layout_width="@dimen/module_v2x_event_button_size" android:layout_height="@dimen/module_v2x_event_button_size" - android:background="@drawable/icon_heart_like_bg" android:gravity="center"> 460px 370px 380px + 84px + 26px + 14px 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 15fbda4e62..3fabb9b780 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 @@ -45,7 +45,7 @@ 2px 30px 22px - + 14px 12px 16px @@ -109,5 +109,8 @@ 460px 370px 380px + 84px + 26px + 14px 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 ad5a85c3fe..b409158f76 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 @@ -84,4 +84,7 @@ 940px 701px + 150px + 46px + 26px 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 eeaac5851d..c9d80ab227 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 @@ -106,6 +106,9 @@ 830px 664px 674px + 150px + 46px + 26px 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 149ad99723..79bc217c51 100644 --- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml @@ -95,4 +95,7 @@ 574px 480px 384px + 150px + 46px + 26px diff --git a/modules/mogo-module-v2x/src/main/res/values/strings.xml b/modules/mogo-module-v2x/src/main/res/values/strings.xml index fb1828d09f..0d71ffb33d 100644 --- a/modules/mogo-module-v2x/src/main/res/values/strings.xml +++ b/modules/mogo-module-v2x/src/main/res/values/strings.xml @@ -9,5 +9,7 @@ 周围5公里,共 %d 条 去分享 刷新 + 停车场推荐 + 26px diff --git a/modules/mogo-module-v2x/src/main/res/values/style.xml b/modules/mogo-module-v2x/src/main/res/values/style.xml index 41038019b1..cc6974e56e 100644 --- a/modules/mogo-module-v2x/src/main/res/values/style.xml +++ b/modules/mogo-module-v2x/src/main/res/values/style.xml @@ -7,4 +7,9 @@ + + + + + \ No newline at end of file