Merge branch 'add' into dev_1.1.2

This commit is contained in:
liujing
2020-08-11 19:17:29 +08:00
2 changed files with 2 additions and 2 deletions

View File

@@ -125,7 +125,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(),DateTimeUtils.M_Yue_d_Ri);
String time = DateTimeUtils.getTimeText(data.getUploadTimestamp(),DateTimeUtils.MM_Yue_dd_Ri_HH_mm);
String likeNum = String.valueOf(data.getLikeNum());
String notLikeNum = String.valueOf(data.getNotLikeNum());

View File

@@ -6,7 +6,7 @@
<style name="customRatingBarStyle" parent="@style/Widget.AppCompat.RatingBar">
<item name="android:minHeight">18px</item>
<item name="android:maxHeight">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>