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

Merge branch 'ui' into dev_1.1.2

Browse Source
This commit is contained in:
liujing
2020-08-07 19:10:31 +08:00
parent ad2a68f9df 0753c50a4f
commit 54a445af53
4 changed files with 65 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
foudations/mogo-utils/src/main/java/com/mogo/utils/DateTimeUtils.java
View File

@@ -443,8 +443,8 @@ public class DateTimeUtils {
* @param timestamp 时间戳
* @return
*/
public static String getTimeText( long timestamp) {
SimpleDateFormat format = new SimpleDateFormat(yyyy_Nian_MM_Yue_dd_Ri, Locale.US);
public static String getTimeText( long timestamp, String dateFormat) {
SimpleDateFormat format = new SimpleDateFormat(dateFormat, Locale.US);
String strStart = format.format(new Date(timestamp));
return strStart;
}

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

@@ -119,7 +119,7 @@ public class V2XShareEventAdapter extends RecyclerView.Adapter<RecyclerView.View
if (data != null) {
String poitype = data.getPoiType();
String address = data.getUploadAddress();
String time = DateTimeUtils.getTimeText(data.getUploadTimestamp());
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) {

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

@@ -9,86 +9,85 @@
<TextView
android:id="@+id/share_event_guide_des"
android:layout_width="wrap_content"
android:layout_height="30dp"
android:layout_height="45dp"
android:paddingLeft="20px"
android:layout_centerHorizontal="true"
android:gravity="center"
android:text="小窍门:分享路况，点赞其他车友，有助于提高热心指数"
android:textColor="#FFFFFF"
android:textSize="16sp">
android:textSize="16px">
</TextView>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="80dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:id="@+id/share_num"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_gravity="center"
android:gravity="center"
android:layout_height="wrap_content"
android:gravity="center_horizontal|bottom"
android:text="0"
android:textColor="#FFFFFF"
android:textSize="25sp" />
android:textSize="36px" />
<TextView
android:id="@+id/shre_num_des"
android:layout_width="match_parent"
android:layout_height="30dp"
android:layout_gravity="center"
android:gravity="center"
android:gravity="center_horizontal|top"
android:text="分享次数"
android:textColor="#FFFFFF"
android:textSize="20sp" />
android:textSize="16px" />
</LinearLayout>
<ImageView
android:layout_width="1dp"
android:layout_height="80dp"
android:layout_width="0.5px"
android:layout_height="46px"
android:background="#FFFFFF" />
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="80dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:id="@+id/share_approve"
android:layout_width="match_parent"
android:layout_height="50dp"
android:gravity="center"
android:layout_height="wrap_content"
android:text="0"
android:gravity="center_horizontal|bottom"
android:textColor="#FFFFFF"
android:textSize="25sp" />
android:textSize="36px" />
<TextView
android:id="@+id/share_approve_des"
android:layout_width="match_parent"
android:layout_height="30dp"
android:gravity="center"
android:gravity="center_horizontal|top"
android:text="车友认同次数"
android:textColor="#FFFFFF"
android:textSize="20sp" />
android:textSize="16px" />
</LinearLayout>
<ImageView
android:layout_width="1dp"
android:layout_height="80dp"
android:layout_width="0.5px"
android:layout_height="46px"
android:background="#FFFFFF" />
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="80dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
@@ -97,19 +96,17 @@
style="@style/customRatingBarStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="20dp"
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"
android:paddingBottom="0dp"
android:gravity="center_horizontal|top"
android:text="热心指数"
android:textColor="#FFFFFF"
android:textSize="20sp" />
android:textSize="16px" />
</LinearLayout>
</LinearLayout>

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

@@ -12,50 +12,67 @@
android:layout_marginLeft="20dp"
android:background="#1E90FF"
android:gravity="center"
android:paddingTop="10dp"
android:layout_marginTop="12px"
android:text="道路类型"
android:textColor="#FFFFFF"
android:textSize="15sp" />
android:textSize="14px" />
<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" />
<TextView
android:id="@+id/road_case_useless_num"
android:layout_width="40dp"
android:layout_height="40dp"
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="10"
android:text="100"
android:textColor="#FFFFFF"
android:textSize="15sp" />
android:textSize="18px" />
<Button
<ImageView
android:id="@+id/road_case_useless"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_width="44px"
android:layout_height="44px"
android:layout_centerInParent="true"
android:layout_toLeftOf="@id/road_case_useless_num"
android:background="@drawable/amap_bus"
android:paddingRight="5px"
android:src="@drawable/amap_bus"
android:gravity="center" />
<TextView
android:id="@+id/road_case_useful_num"
android:layout_width="40dp"
android:layout_height="40dp"
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="5"
android:text="100"
android:textColor="#FFFFFF"
android:textSize="15sp" />
android:textSize="18px" />
<TextView
<ImageView
android:id="@+id/road_case_uselful"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_width="44px"
android:layout_height="44px"
android:layout_centerInParent="true"
android:paddingRight="5px"
android:layout_toLeftOf="@id/road_case_useful_num"
android:background="@drawable/amap_ride" />
android:src="@drawable/amap_ride" />
<TextView
android:id="@+id/road_case_address"
@@ -69,7 +86,7 @@
android:lines="1"
android:text="东城区北三环附近维多欧美"
android:textColor="#FFFFFF"
android:textSize="20sp" />
android:textSize="18px" />
<TextView
android:id="@+id/road_case_share_time"
@@ -80,6 +97,7 @@
android:gravity="left"
android:text="时间:"
android:textColor="#FFFFFF"
android:textSize="13sp" />
android:alpha="0.5"
android:textSize="16px" />
</RelativeLayout>