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

Merge branch 'ui' into qa_1.1.2

Browse Source
This commit is contained in:
liujing
2020-08-18 16:43:48 +08:00
parent 14d3ee444e 1af7263dad
commit ed61bef010
10 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java
View File

@@ -48,6 +48,7 @@ public class V2XShareEventAdapter extends RecyclerView.Adapter<RecyclerView.View
if (viewType == V2XShareEventItemEnum.ITEM_TYPE_NUM_DES) {
View v = shareLayoutInflater.inflate(R.layout.module_v2x_event_share_description, parent,
false);
v.getBackground().setAlpha((int) 0.7);
shareDescriptionViewHolder holder = new shareDescriptionViewHolder(v);
return holder;
} else if (viewType == V2XShareEventItemEnum.ITEM_TYPE_SHARE_LIST) {

BIN
modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_choose.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 700 B

After

Width:  |  Height:  |  Size: 746 B

BIN
modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_second.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 701 B

After

Width:  |  Height:  |  Size: 703 B

BIN
modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_unchoose.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 561 B

After

Width:  |  Height:  |  Size: 601 B

1
modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml
View File

@@ -7,4 +7,5 @@
android:endColor="#3F4057"
android:type="linear"
android:angle="180"/>
</shape>

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

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:angle="270"
android:startColor="@android:color/transparent"
android:endColor="#10121E"/>
</shape>

6
modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml
View File

@@ -91,4 +91,10 @@
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="@+id/rgTabSelect" />
<View
android:layout_width="match_parent"
android:layout_height="60px"
android:background="@drawable/v2x_shadow_shape_view"
app:layout_constraintBottom_toBottomOf="parent" />
</com.mogo.module.v2x.view.RoundConstraintLayout>

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

@@ -60,7 +60,7 @@
android:layout_width="0.5px"
android:layout_height="46px"
android:layout_marginTop="20px"
android:alpha="0.5"
android:alpha="0.3"
android:background="#FFFFFF" />
<LinearLayout
@@ -94,7 +94,7 @@
android:layout_width="0.5px"
android:layout_height="46px"
android:layout_marginTop="20px"
android:alpha="0.5"
android:alpha="0.3"
android:background="#FFFFFF" />
<LinearLayout

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

@@ -6,7 +6,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="20px"
android:layout_marginRight="20px"
android:layout_marginBottom="16px">
android:layout_marginBottom="14px">
<androidx.cardview.widget.CardView
android:id="@+id/road_case_card_view"
@@ -90,6 +90,7 @@
android:ellipsize="end"
android:gravity="left"
android:lines="1"
android:paddingTop="2px"
android:text="东城区北三环附近维多欧美"
android:textColor="#FFFFFF"
android:textSize="18px" />
@@ -104,6 +105,7 @@
android:alpha="0.5"
android:gravity="left"
android:text="时间:"
android:paddingTop="2px"
android:textColor="#FFFFFF"
android:textSize="16px" />
</RelativeLayout>

10
modules/mogo-module-v2x/src/main/res/values/style.xml
View File

@@ -5,11 +5,11 @@
</declare-styleable>
<style name="customRatingBarStyle" parent="@style/Widget.AppCompat.RatingBar">
<item name="android:minHeight">18px</item>
<item name="android:maxHeight">20px</item>
<item name="android:maxWidth">16px</item>
<item name="android:minWidth">16px</item>
<item name="android:spacing">3.7px</item>
<item name="android:minHeight">16px</item>
<item name="android:maxHeight">26px</item>
<item name="android:maxWidth">18px</item>
<item name="android:minWidth">18px</item>
<item name="android:spacing">4dp</item>
<item name="android:numStars">5</item>
<item name="android:rating">1</item>
<item name="android:stepSize">0.5</item>