Commit f0c4a7a3 by ydl

backup

parent cad1c67e
...@@ -9,7 +9,7 @@ ext { ...@@ -9,7 +9,7 @@ ext {
"m-consultant" : "0.0.59.20", "m-consultant" : "0.0.59.20",
"m-fm" : "0.0.30.00", "m-fm" : "0.0.30.00",
"m-user" : "0.0.60.20", "m-user" : "0.0.60.20",
"m-home" : "0.0.22.70", "m-home" : "0.0.22.8",
"m-im" : "0.0.18.20", "m-im" : "0.0.18.20",
"m-dynamic" : "0.0.7.70", "m-dynamic" : "0.0.7.70",
"m-article" : "0.0.0.6", "m-article" : "0.0.0.6",
......
...@@ -33,7 +33,7 @@ class HomeAssuageGriefImageItemView( ...@@ -33,7 +33,7 @@ class HomeAssuageGriefImageItemView(
radius = 4f radius = 4f
cardElevation = 0f cardElevation = 0f
var screenWidth = RxDeviceTool.getScreenWidth(mContext) var screenWidth = RxDeviceTool.getScreenWidth(mContext)
var viewWidth = (screenWidth - 2 * 30 * RxDeviceTool.getScreenDensity(mContext)).toInt() var viewWidth = (screenWidth - 2 * 16 * RxDeviceTool.getScreenDensity(mContext)).toInt()
var params: LinearLayout.LayoutParams? var params: LinearLayout.LayoutParams?
//根据图片的数量,加载不同的图片布局 //根据图片的数量,加载不同的图片布局
......
...@@ -66,9 +66,7 @@ class HomeCourseItemView(private val mContext: Context, private var homeEvent: I ...@@ -66,9 +66,7 @@ class HomeCourseItemView(private val mContext: Context, private var homeEvent: I
fun getLastPrice(price: String): String { fun getLastPrice(price: String): String {
if (price.length > 3) { if (price.length > 3) {
if ("0".equals(price[price.lastIndex]) && "0".equals(price[price.lastIndex - 1]) && ".".equals( if ("0" == price[price.lastIndex].toString() && "0" == price[price.lastIndex - 1].toString() && "." == price[price.lastIndex - 2].toString()
price[price.lastIndex - 2]
)
) { ) {
return price.substring(0, price.length - 3) return price.substring(0, price.length - 3)
} }
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<corners android:radius="@dimen/platform_dp_4"/> <corners android:radius="@dimen/platform_dp_4"/>
<stroke android:width="1dp" <stroke android:width="0.5dp"
android:color="#CCCCCC" /> android:color="#CCCCCC" />
</shape> </shape>
\ No newline at end of file
...@@ -4,6 +4,6 @@ ...@@ -4,6 +4,6 @@
<solid android:color="#F8F8F8" /> <solid android:color="#F8F8F8" />
<corners android:radius="@dimen/platform_dp_4"/> <corners android:radius="@dimen/platform_dp_8"/>
</shape> </shape>
\ No newline at end of file
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
android:ellipsize="end" android:ellipsize="end"
android:textSize="@dimen/platform_dp_17" android:textSize="@dimen/platform_dp_17"
android:textStyle="bold" android:textStyle="bold"
android:lineHeight="19dp"
android:layout_marginTop="-2dp" android:layout_marginTop="-2dp"
android:textColor="@color/platform_color_242424" android:textColor="@color/platform_color_242424"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
...@@ -53,7 +54,7 @@ ...@@ -53,7 +54,7 @@
android:ellipsize="end" android:ellipsize="end"
android:textSize="@dimen/platform_dp_13" android:textSize="@dimen/platform_dp_13"
android:layout_marginTop="@dimen/platform_dp_6" android:layout_marginTop="@dimen/platform_dp_6"
android:textColor="@color/platform_color_666666" android:textColor="@color/platform_color_999999"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_below="@+id/homeModuleArticleItemViewTitle" android:layout_below="@+id/homeModuleArticleItemViewTitle"
android:lineSpacingExtra="@dimen/platform_dp_3" android:lineSpacingExtra="@dimen/platform_dp_3"
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
android:id="@+id/homeModuleAssuageGriefViewContent" android:id="@+id/homeModuleAssuageGriefViewContent"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:maxLines="3" android:maxLines="1"
android:ellipsize="end" android:ellipsize="end"
android:lineSpacingExtra="@dimen/platform_dp_5" android:lineSpacingExtra="@dimen/platform_dp_5"
android:paddingLeft="@dimen/platform_dp_16" android:paddingLeft="@dimen/platform_dp_16"
...@@ -126,7 +126,8 @@ ...@@ -126,7 +126,8 @@
android:orientation="horizontal" android:orientation="horizontal"
android:paddingLeft="@dimen/platform_dp_16" android:paddingLeft="@dimen/platform_dp_16"
android:paddingRight="@dimen/platform_dp_16" android:paddingRight="@dimen/platform_dp_16"
android:layout_marginTop="@dimen/platform_dp_12"> android:layout_marginTop="@dimen/platform_dp_12"
android:gravity="center_vertical">
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="28dp" android:layout_height="28dp"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment