Merge remote-tracking branch 'origin/feature/v1.0.0' into feature/v1.0.0

This commit is contained in:
zhangyuanzhen
2020-02-13 16:01:18 +08:00

View File

@@ -27,10 +27,10 @@
android:ellipsize="end"
android:gravity="center_vertical"
android:maxLines="1"
android:text="@string/main_empty_location"
android:textColor="@color/white"
android:textSize="@dimen/tanlu_module_card_address_size"
android:textStyle="bold" />
<!-- android:text="@string/main_empty_location"-->
<TextView
android:id="@+id/tv_distance_video"
@@ -40,10 +40,10 @@
android:layout_marginLeft="@dimen/tanlu_module_card_margin_left"
android:layout_marginTop="@dimen/tanlu_module_card_distance_margin_top"
android:layout_marginBottom="@dimen/tanlu_module_card_distance_margin_bottom"
android:text="666KM"
android:textColor="@color/color_99FFFFFF"
android:textSize="@dimen/tanlu_module_card_distance_size"
android:textStyle="bold" />
<!-- android:text="0KM"-->
<TextView
android:id="@+id/tv_information_media_time"
@@ -53,9 +53,10 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="@dimen/tanlu_module_card_margin_left"
android:text="2019-10-10"
android:textColor="@color/color_99FFFFFF"
android:textSize="@dimen/tanlu_module_card_distance_size" />
<!-- android:text="2019-10-10"-->
</RelativeLayout>
<!--视频播放器和图片播放器-->