ui opt

2021-01-14 15:59:56 +08:00
parent 64aad292a5
commit b00985eb82
17 changed files with 5 additions and 50 deletions
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -84,7 +84,6 @@
          </set>
        </option>
        <option name="resolveModulePerSourceSet" value="false" />
-        <option name="useQualifiedModuleNames" value="true" />
      </GradleProjectSettings>
    </option>
  </component>
--- a/modules/mogo-module-common/src/main/res/drawable-ldpi/module_services_marker_bkg.png
+++ b/modules/mogo-module-common/src/main/res/drawable-ldpi/module_services_marker_bkg.png
--- a/modules/mogo-module-common/src/main/res/drawable-mdpi/module_services_marker_bkg.png
+++ b/modules/mogo-module-common/src/main/res/drawable-mdpi/module_services_marker_bkg.png
--- a/modules/mogo-module-common/src/main/res/drawable/module_ext_shadow_bkg.9.png
+++ b/modules/mogo-module-common/src/main/res/drawable/module_ext_shadow_bkg.9.png
--- a/modules/mogo-module-common/src/main/res/values-mdpi/dimens.xml
+++ b/modules/mogo-module-common/src/main/res/values-mdpi/dimens.xml
@@ -10,8 +10,8 @@

    <dimen name="module_service_marker_anchor_size">16dp</dimen>
    <dimen name="module_service_marker_dot_marginTop">2dp</dimen>
-    <dimen name="module_service_marker_bubble_width">56px</dimen>
-    <dimen name="module_service_marker_bubble_height">65px</dimen>
+    <dimen name="module_service_marker_bubble_width">70px</dimen>
+    <dimen name="module_service_marker_bubble_height">76px</dimen>
    <dimen name="module_service_marker_bubble_icon_width">35px</dimen>
    <dimen name="module_service_marker_bubble_icon_height">35px</dimen>
    <dimen name="module_service_marker_bubble_icon_marginBottom">4px</dimen>
--- a/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml
@@ -1064,7 +1064,7 @@

    <dimen name="module_service_marker_anchor_size">20dp</dimen>
    <dimen name="module_service_marker_dot_marginTop">4dp</dimen>
-    <dimen name="module_service_marker_bubble_width">100px</dimen>
+    <dimen name="module_service_marker_bubble_width">120px</dimen>
    <dimen name="module_service_marker_bubble_vr_width">55px</dimen>
    <dimen name="module_service_marker_bubble_height">130px</dimen>
    <dimen name="module_service_marker_bubble_vr_height">69px</dimen>
--- a/modules/mogo-module-common/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-common/src/main/res/values/dimens.xml
@@ -1056,8 +1056,8 @@

 	<dimen name="module_service_marker_anchor_size">16dp</dimen>
 	<dimen name="module_service_marker_dot_marginTop">2dp</dimen>
-	<dimen name="module_service_marker_bubble_width">56px</dimen>
-	<dimen name="module_service_marker_bubble_height">65px</dimen>
+	<dimen name="module_service_marker_bubble_width">70px</dimen>
+	<dimen name="module_service_marker_bubble_height">76px</dimen>
 	<dimen name="module_service_marker_bubble_icon_width">35px</dimen>
 	<dimen name="module_service_marker_bubble_icon_height">35px</dimen>
 	<dimen name="module_service_marker_bubble_icon_marginBottom">4px</dimen>
--- a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_services_marker_bkg.png
+++ b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_services_marker_bkg.png
--- a/modules/mogo-module-service/src/main/res/layout/modudle_services_marker_layout.xml
+++ b/modules/mogo-module-service/src/main/res/layout/modudle_services_marker_layout.xml
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:gravity="center"
-    android:orientation="vertical"
-    android:padding="1px"
-    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
-
-    <FrameLayout
-        android:id="@+id/clMarkerTopView"
-        android:layout_width="@dimen/module_service_marker_bubble_width"
-        android:background="@drawable/module_services_marker_bkg"
-        android:layout_height="@dimen/module_service_marker_bubble_height">
-
-        <com.mogo.service.imageloader.MogoImageView
-            android:id="@+id/ivIcon"
-            android:layout_width="@dimen/module_service_marker_bubble_icon_width"
-            android:layout_height="@dimen/module_service_marker_bubble_icon_height"
-            android:layout_gravity="center"
-            android:layout_marginBottom="@dimen/module_service_marker_bubble_icon_marginBottom"
-            tools:src="@drawable/icon_map_marker_road_block_up2" />
-
-    </FrameLayout>
-
-    <ImageView
-        android:id="@+id/ivCar"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/module_service_marker_dot_marginTop"
-        android:src="@drawable/icon_map_marker_location_yellow" />
-</LinearLayout>
--- a/modules/mogo-module-service/src/main/res/values-ldpi/dimens.xml
+++ b/modules/mogo-module-service/src/main/res/values-ldpi/dimens.xml
@@ -2,8 +2,6 @@
 <resources>
    <dimen name="module_service_marker_anchor_size">16dp</dimen>
    <dimen name="module_service_marker_dot_marginTop">2px</dimen>
-    <dimen name="module_service_marker_bubble_width">70px</dimen>
-    <dimen name="module_service_marker_bubble_height">76px</dimen>
    <dimen name="module_service_marker_bubble_icon_width">35px</dimen>
    <dimen name="module_service_marker_bubble_icon_height">35px</dimen>
    <dimen name="module_service_marker_bubble_icon_marginBottom">4px</dimen>
--- a/modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml
+++ b/modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml
@@ -2,8 +2,6 @@
 <resources>
    <dimen name="module_service_marker_anchor_size">16dp</dimen>
    <dimen name="module_service_marker_dot_marginTop">2px</dimen>
-    <dimen name="module_service_marker_bubble_width">70px</dimen>
-    <dimen name="module_service_marker_bubble_height">76px</dimen>
    <dimen name="module_service_marker_bubble_icon_width">35px</dimen>
    <dimen name="module_service_marker_bubble_icon_height">35px</dimen>
    <dimen name="module_service_marker_bubble_icon_marginBottom">4px</dimen>
--- a/modules/mogo-module-service/src/main/res/values-xhdpi-1920x1000/dimens.xml
+++ b/modules/mogo-module-service/src/main/res/values-xhdpi-1920x1000/dimens.xml
@@ -2,8 +2,6 @@
 <resources>
    <dimen name="module_service_marker_anchor_size">20dp</dimen>
    <dimen name="module_service_marker_dot_marginTop">4px</dimen>
-    <dimen name="module_service_marker_bubble_width">120px</dimen>
-    <dimen name="module_service_marker_bubble_height">130px</dimen>
    <dimen name="module_service_marker_bubble_icon_width">60px</dimen>
    <dimen name="module_service_marker_bubble_icon_height">60px</dimen>
    <dimen name="module_service_marker_bubble_icon_marginBottom">8px</dimen>
--- a/modules/mogo-module-service/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-service/src/main/res/values-xhdpi/dimens.xml
@@ -2,8 +2,6 @@
 <resources>
    <dimen name="module_service_marker_anchor_size">20dp</dimen>
    <dimen name="module_service_marker_dot_marginTop">4px</dimen>
-    <dimen name="module_service_marker_bubble_width">120px</dimen>
-    <dimen name="module_service_marker_bubble_height">130px</dimen>
    <dimen name="module_service_marker_bubble_icon_width">60px</dimen>
    <dimen name="module_service_marker_bubble_icon_height">60px</dimen>
    <dimen name="module_service_marker_bubble_icon_marginBottom">8px</dimen>
--- a/modules/mogo-module-service/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-service/src/main/res/values/dimens.xml
@@ -2,8 +2,6 @@
 <resources>
    <dimen name="module_service_marker_anchor_size">20dp</dimen>
    <dimen name="module_service_marker_dot_marginTop">4px</dimen>
-    <dimen name="module_service_marker_bubble_width">120px</dimen>
-    <dimen name="module_service_marker_bubble_height">130px</dimen>
    <dimen name="module_service_marker_bubble_icon_width">60px</dimen>
    <dimen name="module_service_marker_bubble_icon_height">60px</dimen>
    <dimen name="module_service_marker_bubble_icon_marginBottom">8px</dimen>
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/destination/基于目的地违章高发情况的停车推荐
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/destination/基于目的地违章高发情况的停车推荐
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/destination/基于目的地预判的道路事件提醒、路线推荐
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/destination/基于目的地预判的道路事件提醒、路线推荐
--- a/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/module_ext_shadow_bkg_light.9.png
+++ b/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/module_ext_shadow_bkg_light.9.png