yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'ff' into dev

Browse Source
This commit is contained in:
liujing
2020-09-07 19:14:26 +08:00
parent f29eb4d30c 2fdf10bc3f
commit 0704a8e08a
8 changed files with 53 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/mogo-module-v2x/src/main/res/drawable/v2x_bkg_dark_light_same.xml Normal file
View File

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="@dimen/dp_180" />
<gradient
android:angle="135"
android:endColor="#2E324B"
android:startColor="#585E8B"
android:type="linear"
android:useLevel="true" />
</shape>

24
modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml
View File

@@ -20,7 +20,7 @@
android:paddingTop="10px"
android:text="小窍门：分享路况，点赞其他车主，有助于提高热心指数"
android:textColor="#FFFFFF"
android:textSize="16px">
android:textSize="@dimen/share_top_text_size">
</TextView>
@@ -42,17 +42,17 @@
android:gravity="center_horizontal|center"
android:text="0"
android:textColor="#FFFFFF"
android:textSize="36px" />
android:textSize="@dimen/share_des_num_size" />
<TextView
android:id="@+id/shre_num_des"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal|center"
android:paddingBottom="22px"
android:text="分享次数"
android:textColor="#FFFFFF"
android:textSize="16px"
android:paddingBottom="22px"/>
android:textSize="@dimen/share_index_des_size" />
</LinearLayout>
@@ -76,17 +76,17 @@
android:gravity="center_horizontal|top"
android:text="0"
android:textColor="#FFFFFF"
android:textSize="36px" />
android:textSize="@dimen/share_des_num_size" />
<TextView
android:id="@+id/share_approve_des"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal|top"
android:paddingBottom="22px"
android:text="车友认同次数"
android:textColor="#FFFFFF"
android:textSize="16px"
android:paddingBottom="22px"/>
android:textSize="@dimen/share_index_des_size" />
</LinearLayout>
@@ -101,9 +101,9 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical"
android:paddingTop="17px"
android:gravity="center">
android:paddingTop="@dimen/v2x_index_rating_top">
<RatingBar
android:id="@+id/rating_bar"
@@ -116,12 +116,12 @@
android:id="@+id/share_index_des"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="热心指数"
android:layout_alignTop="@id/share_approve_des"
android:textColor="#FFFFFF"
android:gravity="center"
android:paddingTop="15px"
android:textSize="16px" />
android:text="热心指数"
android:textColor="#FFFFFF"
android:textSize="@dimen/share_index_des_size" />
</LinearLayout>
</LinearLayout>

4
modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml
View File

@@ -28,7 +28,7 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="20px">
android:layout_marginTop="@dimen/share_empty_btn_padding">
<Button
android:id="@+id/share_event_button"
@@ -36,7 +36,7 @@
android:layout_height="@dimen/v2x_share_btn_height"
android:layout_centerHorizontal="true"
android:layout_toLeftOf="@id/center"
android:background="@drawable/v2xt_dw_common_corner_bkg_dark"
android:background="@drawable/v2x_bkg_dark_light_same"
android:clickable="true"
android:onClick="shareEventAction"
android:text="去分享"

4
modules/mogo-module-v2x/src/main/res/layout/view_history_empty.xml
View File

@@ -8,7 +8,7 @@
android:id="@+id/ivEmptyView"
android:layout_width="@dimen/dp_355"
android:layout_height="@dimen/dp_355"
android:layout_marginTop="@dimen/dp_120"
android:layout_marginTop="60px"
android:src="@drawable/icon_share_empty"
app:layout_constraintBottom_toTopOf="@+id/tvTrip"
app:layout_constraintEnd_toEndOf="parent"
@@ -23,7 +23,7 @@
android:gravity="center"
android:text="周边5公里，暂无交通事件\n
你可以试着分享一个交通事件给其他车主"
android:textColor="@color/transparent_white_30"
android:textColor="@color/v2x_FFF_333"
android:textSize="@dimen/dp_36"
app:layout_constraintBottom_toTopOf="@+id/btnShear"
app:layout_constraintEnd_toEndOf="parent"

2
modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml
View File

@@ -53,7 +53,7 @@
<dimen name="module_v2x_surrounding_item_bottom_left_textsize">36px</dimen>
<dimen name="module_v2x_surrounding_item_bottom_right_textsize">28px</dimen>
<dimen name="module_v2x_des_index_width">16px</dimen>
<dimen name="module_v2x_des_index_height">4px</dimen>
<dimen name="module_v2x_des_index_height">40px</dimen>
<dimen name="module_v2x_panel_cor">16px</dimen>
<dimen name="module_v2x_panel_width">120px</dimen>

9
modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
View File

@@ -54,13 +54,18 @@
<dimen name="module_v2x_surrounding_item_bottom_left_textsize">36px</dimen>
<dimen name="module_v2x_surrounding_item_bottom_right_textsize">28px</dimen>
<dimen name="module_v2x_des_index_width">16px</dimen>
<dimen name="module_v2x_des_index_height">4px</dimen>
<dimen name="module_v2x_des_index_height">40px</dimen>
<dimen name="module_v2x_panel_icon_cor">30px</dimen>
<dimen name="module_v2x_panel_width">120px</dimen>
<dimen name="share_empty_icon_width">360px</dimen>
<dimen name="share_empty_icon_width">219px</dimen>
<dimen name="v2x_loading_ani_width">400px</dimen>
<dimen name="v2x_share_btn_width">281px</dimen>
<dimen name="v2x_share_btn_height">90px</dimen>
<dimen name="v2x_share_btn_size">33.75px</dimen>
<dimen name="v2x_index_rating_top">35px</dimen>
<dimen name="share_top_text_size">30px</dimen>
<dimen name="share_des_num_size">67.5px</dimen>
<dimen name="share_index_des_size">30px</dimen>
<dimen name="share_empty_btn_padding">80px</dimen>
</resources>

5
modules/mogo-module-v2x/src/main/res/values/dimens.xml
View File

@@ -64,6 +64,11 @@
<dimen name="v2x_share_btn_width">150px</dimen>
<dimen name="v2x_share_btn_height">48px</dimen>
<dimen name="v2x_share_btn_size">18px</dimen>
<dimen name="v2x_index_rating_top">17px</dimen>
<dimen name="share_top_text_size">16px</dimen>
<dimen name="share_des_num_size">36px</dimen>
<dimen name="share_index_des_size">16px</dimen>
<dimen name="share_empty_btn_padding">20px</dimen>
</resources>

12
skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_bkg_dark_light_same_light.xml Normal file
View File

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="@dimen/dp_180" />
<gradient
android:angle="135"
android:endColor="#2E324B"
android:startColor="#585E8B"
android:type="linear"
android:useLevel="true" />
</shape>