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

Merge branch 'uii' into dev_1.1.2

Browse Source
This commit is contained in:
liujing
2020-08-10 17:09:15 +08:00
parent 5616b6a829 373291558e
commit 47a2792a44
6 changed files with 146 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,9 @@
package com.mogo.module.v2x.adapter;
import android.content.Context;
import android.graphics.Canvas;
import android.graphics.ColorFilter;
import android.graphics.drawable.Drawable;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -9,6 +12,7 @@ import android.widget.RatingBar;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.RecyclerView;
import com.alibaba.android.arouter.launcher.ARouter;
@@ -19,6 +23,7 @@ import com.mogo.module.v2x.entity.panel.V2XShareEventItemEnum;
import com.mogo.module.v2x.entity.panel.V2XShareEventLoadMoreItem;
import com.mogo.module.v2x.fragment.V2XEventPanelFragment;
import com.mogo.module.v2x.listener.AdapterCallback;
import com.mogo.module.v2x.utils.EventTypeUtils;
import com.mogo.service.IMogoServiceApis;
import com.mogo.service.MogoServicePaths;
import com.mogo.utils.DateTimeUtils;
@@ -122,8 +127,11 @@ public class V2XShareEventAdapter extends RecyclerView.Adapter<RecyclerView.View
String time = DateTimeUtils.getTimeText(data.getUploadTimestamp(),DateTimeUtils.M_Yue_d_Ri);
String likeNum = String.valueOf(data.getLikeNum());
String notLikeNum = String.valueOf(data.getNotLikeNum());
if (poitype != null) {
((shareItemViewHolder) holder).caseStyleTextView.setText(poitype);
((shareItemViewHolder) holder).caseStyleTextView.setText(EventTypeUtils.getPoiTypeStr(poitype));
((shareItemViewHolder) holder).caseStyleTextView.setBackgroundResource(EventTypeUtils.getPoiTypeBg(poitype));
}
if (address != null) {
((shareItemViewHolder) holder).caseAddressTextView.setText(address);

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

@@ -5,5 +5,6 @@
<gradient
android:startColor="#5E6079"
android:endColor="#3F4057"
android:type="linear"/>
android:type="linear"
android:angle="180"/>
</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>

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

@@ -3,19 +3,21 @@
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/bg_v2x_event_description"
android:layout_marginLeft="20px"
android:layout_marginRight="20px"
android:layout_marginBottom="12px">
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:paddingLeft="20px"
android:paddingTop="10px"
android:text="小窍门:分享路况，点赞其他车友，有助于提高热心指数"
android:textColor="#FFFFFF"
android:textSize="16px">
@@ -24,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"
@@ -36,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" />
@@ -44,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
@@ -67,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>

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

@@ -1,108 +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:background="@color/share_event_item_bg_color"
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"
android:layout_marginBottom="11px"/>
</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>

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>