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

Merge remote-tracking branch 'origin/dev_1.1.2' into dev_1.1.2

Browse Source
This commit is contained in:
董宏宇
2020-08-10 17:16:13 +08:00
parent 585be68dab cb4b75de50
commit 715fe3e0a6
298 changed files with 14095 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="12px"/>
<gradient
android:startColor="#5E6079"
android:endColor="#3F4057"
android:type="linear"
android:angle="180"/>
</shape>

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

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/share_event_item_bg_color"/>
<corners android:radius="12px"/>
</shape>

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

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="@dimen/dp_10" />
<gradient
android:startColor="#8384A9"
android:endColor="#676982"/>
</shape>

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

@@ -3,17 +3,22 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:background="@drawable/v2x_alert_window_bg">
android:layout_marginLeft="20px"
android:layout_marginRight="20px"
android:layout_marginBottom="16px"
android:background="@drawable/bg_v2x_event_description"
android:orientation="vertical">
<TextView
android:id="@+id/share_event_guide_des"
android:layout_width="wrap_content"
android:layout_height="45dp"
android:paddingLeft="20px"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:alpha="0.8"
android:gravity="center"
android:text="小窍门:分享路况，点赞其他车友，有助于提高热心指数"
android:paddingLeft="20px"
android:paddingTop="10px"
android:text="小窍门：分享路况，点赞其他车主，有助于提高热心指数"
android:textColor="#FFFFFF"
android:textSize="16px">
@@ -21,7 +26,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:paddingTop="12px">
<LinearLayout
android:layout_width="fill_parent"
@@ -33,7 +39,7 @@
android:id="@+id/share_num"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal|bottom"
android:gravity="center_horizontal|center"
android:text="0"
android:textColor="#FFFFFF"
android:textSize="36px" />
@@ -41,17 +47,20 @@
<TextView
android:id="@+id/shre_num_des"
android:layout_width="match_parent"
android:layout_height="30dp"
android:gravity="center_horizontal|top"
android:layout_height="wrap_content"
android:gravity="center_horizontal|center"
android:text="分享次数"
android:textColor="#FFFFFF"
android:textSize="16px" />
android:textSize="16px"
android:paddingBottom="22px"/>
</LinearLayout>
<ImageView
android:layout_width="0.5px"
android:layout_height="46px"
android:layout_marginTop="20px"
android:alpha="0.5"
android:background="#FFFFFF" />
<LinearLayout
@@ -64,48 +73,53 @@
android:id="@+id/share_approve"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal|top"
android:text="0"
android:gravity="center_horizontal|bottom"
android:textColor="#FFFFFF"
android:textSize="36px" />
<TextView
android:id="@+id/share_approve_des"
android:layout_width="match_parent"
android:layout_height="30dp"
android:layout_height="wrap_content"
android:gravity="center_horizontal|top"
android:text="车友认同次数"
android:textColor="#FFFFFF"
android:textSize="16px" />
android:textSize="16px"/>
</LinearLayout>
<ImageView
android:layout_width="0.5px"
android:layout_height="46px"
android:layout_marginTop="20px"
android:alpha="0.5"
android:background="#FFFFFF" />
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
android:orientation="vertical"
android:paddingTop="17px"
android:gravity="center">
<RatingBar
android:id="@+id/rating_bar"
style="@style/customRatingBarStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal|bottom"
android:isIndicator="true" />
<TextView
android:id="@+id/share_index_des"
android:layout_width="match_parent"
android:layout_height="30dp"
android:gravity="center_horizontal|top"
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" />
</LinearLayout>

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

@@ -17,18 +17,20 @@
android:layout_below="@+id/no_share_image"
android:layout_centerHorizontal="true"
android:gravity="center"
android:alpha="0.7"
android:text="你还没有分享过道路事件，快去试试吧" />
<Button
android:id="@+id/share_event_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="220px"
android:layout_height="48px"
android:layout_below="@+id/share_event_null_des"
android:layout_centerHorizontal="true"
android:background="#FFFFFF"
android:background="@drawable/bg_v2x_event_live_show"
android:clickable="true"
android:onClick="shareEventAction"
android:text="去分享"
android:textColor="#FFFFFF"
android:textSize="25sp" />
</RelativeLayout>

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

@@ -1,103 +1,111 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/road_case_liset_item"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:layout_marginLeft="20px"
android:layout_marginRight="20px"
android:layout_marginBottom="16px">
<TextView
android:id="@+id/road_case_style"
android:layout_width="wrap_content"
<androidx.cardview.widget.CardView
android:id="@+id/road_case_card_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:background="#1E90FF"
android:gravity="center"
android:layout_marginTop="12px"
android:text="道路类型"
android:textColor="#FFFFFF"
android:textSize="14px" />
app:cardBackgroundColor="#1F2131"
app:cardCornerRadius="12px"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/road_case_remain"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="12px"
android:background="#1E90FF"
android:gravity="center"
android:layout_alignTop="@id/road_case_style"
android:layout_toRightOf="@id/road_case_style"
android:text="评价状态"
android:textColor="#FFFFFF"
android:textSize="14px" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/road_case_useless_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerInParent="true"
android:paddingRight="20px"
android:gravity="center"
android:text="100"
android:textColor="#FFFFFF"
android:textSize="18px" />
<TextView
android:id="@+id/road_case_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="20px"
android:layout_marginTop="12px"
android:background="@drawable/bg_v2x_event_type_read"
android:gravity="center"
android:paddingLeft="5px"
android:paddingTop="3px"
android:paddingRight="5px"
android:paddingBottom="3px"
android:text="道路类型"
android:textColor="#FFFFFF"
android:textSize="14px" />
<TextView
android:id="@+id/road_case_useless_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerInParent="true"
android:gravity="center"
android:paddingRight="20px"
android:text="100"
android:textColor="#FFFFFF"
android:textSize="18px" />
<ImageView
android:id="@+id/road_case_useless"
android:layout_width="44px"
android:layout_height="44px"
android:layout_centerInParent="true"
android:layout_toLeftOf="@id/road_case_useless_num"
android:paddingRight="5px"
android:src="@drawable/amap_bus"
android:gravity="center" />
<ImageView
android:id="@+id/road_case_useless"
android:layout_width="44px"
android:layout_height="44px"
android:layout_centerInParent="true"
android:layout_toLeftOf="@id/road_case_useless_num"
android:gravity="center"
android:paddingRight="5px"
android:src="@drawable/amap_bus" />
<TextView
android:id="@+id/road_case_useful_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_toLeftOf="@id/road_case_useless"
android:paddingRight="26px"
android:gravity="center"
android:text="100"
android:textColor="#FFFFFF"
android:textSize="18px" />
<TextView
android:id="@+id/road_case_useful_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_toLeftOf="@id/road_case_useless"
android:gravity="center"
android:paddingRight="26px"
android:text="100"
android:textColor="#FFFFFF"
android:textSize="18px" />
<ImageView
android:id="@+id/road_case_uselful"
android:layout_width="44px"
android:layout_height="44px"
android:layout_centerInParent="true"
android:paddingRight="5px"
android:layout_toLeftOf="@id/road_case_useful_num"
android:src="@drawable/amap_ride" />
<ImageView
android:id="@+id/road_case_uselful"
android:layout_width="44px"
android:layout_height="44px"
android:layout_centerInParent="true"
android:layout_toLeftOf="@id/road_case_useful_num"
android:paddingRight="5px"
android:src="@drawable/amap_ride" />
<TextView
android:id="@+id/road_case_address"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/road_case_style"
android:layout_alignLeft="@id/road_case_style"
android:layout_toLeftOf="@id/road_case_uselful"
android:ellipsize="end"
android:gravity="left"
android:lines="1"
android:text="东城区北三环附近维多欧美"
android:textColor="#FFFFFF"
android:textSize="18px" />
<TextView
android:id="@+id/road_case_address"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/road_case_style"
android:layout_alignLeft="@id/road_case_style"
android:layout_toLeftOf="@id/road_case_uselful"
android:ellipsize="end"
android:gravity="left"
android:lines="1"
android:text="东城区北三环附近维多欧美"
android:textColor="#FFFFFF"
android:textSize="18px" />
<TextView
android:id="@+id/road_case_share_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/road_case_address"
android:layout_marginLeft="20dp"
android:gravity="left"
android:text="时间:"
android:textColor="#FFFFFF"
android:alpha="0.5"
android:textSize="16px" />
</RelativeLayout>
<TextView
android:id="@+id/road_case_share_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/road_case_address"
android:layout_marginLeft="20px"
android:layout_marginBottom="11px"
android:alpha="0.5"
android:gravity="left"
android:text="时间:"
android:textColor="#FFFFFF"
android:textSize="16px" />
</RelativeLayout>
</androidx.cardview.widget.CardView>
</androidx.constraintlayout.widget.ConstraintLayout>

1
modules/mogo-module-v2x/src/main/res/values/color.xml
View File

@@ -5,6 +5,7 @@
<color name="surrounding_card_background">#10121E</color>
<color name="white">#FFFFFF</color>
<color name="transparent_white_30">#4DFFFFFF</color>
<color name="share_event_item_bg_color">#1F2131</color>
</resources>

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">20dp</item>
<item name="android:maxHeight">20dp</item>
<item name="android:maxWidth">20dp</item>
<item name="android:minWidth">20dp</item>
<item name="android:spacing">4dp</item>
<item name="android:minHeight">17px</item>
<item name="android:maxHeight">17px</item>
<item name="android:maxWidth">15.4px</item>
<item name="android:minWidth">15.4px</item>
<item name="android:spacing">3.7px</item>
<item name="android:numStars">5</item>
<item name="android:rating">1</item>
<item name="android:stepSize">0.5</item>