Skip to content

S
ShenghuoquanBusiness
Commit e00aab1f authored by shiyl's avatar shiyl
Browse files
Options

Merge branch 'feature/dev_fight_order' of... 

Merge branch 'feature/dev_fight_order' of https://git.yidian-inc.com:8021/bp/ShenghuoquanBusiness into feature/dev_fight_order
parents 49944a09 21adc216
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 22 deletions
Components/BUserOrder/src/main/java/com/yidian/shenghuoquan/buserorder/adapter/OrderListAdapter.kt
View file @ e00aab1f
......@@ -7,6 +7,7 @@ import android.widget.LinearLayout
import android.widget.RelativeLayout
import android.widget.TextView
import com.bumptech.glide.Glide
import com.bumptech.glide.load.resource.bitmap.CenterCrop
import com.bumptech.glide.load.resource.bitmap.RoundedCorners
import com.bumptech.glide.request.RequestOptions
import com.chad.library.adapter.base.BaseQuickAdapter
......@@ -18,13 +19,14 @@ import com.yidian.bcommon.utils.CPointUtils
import com.yidian.shenghuoquan.buserorder.R
import com.yidian.shenghuoquan.buserorder.app.bean.OrderWebData
import com.yidian.shenghuoquan.buserorder.utils.Utils
import com.yidian.utils.DensityUtil
import com.yidian.xpage.XPageManager
import org.json.JSONObject
import timber.log.Timber
class OrderListAdapter : BaseQuickAdapter<OrderWebData, BaseViewHolder>(R.layout.border_recycle_order_item){
companion object{
const val roundRadus = 40
const val roundRadus:Float = 10.0F
}
override fun convert(holder: BaseViewHolder, item: OrderWebData) {
......@@ -49,9 +51,9 @@ class OrderListAdapter : BaseQuickAdapter<OrderWebData, BaseViewHolder>(R.layout
holder.itemView.findViewById<LinearLayout>(R.id.ll_order_image2).visibility = View.GONE
holder.itemView.findViewById<LinearLayout>(R.id.ll_order_image3).visibility = View.GONE
if (Utils.isWebUrl(data.order_item_list[0].desc_pic_url)) {
Glide.with(context).load(Uri.parse(data.order_item_list[0].desc_pic_url)).apply(RequestOptions.bitmapTransform(RoundedCorners(
roundRadus
))).into(holder.itemView.findViewById(R.id.round_image1))
Glide.with(context).load(Uri.parse(data.order_item_list[0].desc_pic_url)).apply(RequestOptions().transform(
CenterCrop(), RoundedCorners(
DensityUtil.dp2px(roundRadus)))).into(holder.itemView.findViewById(R.id.round_image1))
}
}
2 -> {
......@@ -59,12 +61,12 @@ class OrderListAdapter : BaseQuickAdapter<OrderWebData, BaseViewHolder>(R.layout
holder.itemView.findViewById<TextView>(R.id.tv_goog2_name).text = data.order_item_list[1].goods_name
holder.itemView.findViewById<LinearLayout>(R.id.ll_order_image3).visibility = View.GONE
if (Utils.isWebUrl(data.order_item_list[0].desc_pic_url) && Utils.isWebUrl(data.order_item_list[1].desc_pic_url)) {
Glide.with(context).load(Uri.parse(data.order_item_list[0].desc_pic_url)).apply(RequestOptions.bitmapTransform(RoundedCorners(
roundRadus
))).into(holder.itemView.findViewById(R.id.round_image1))
Glide.with(context).load(Uri.parse( data.order_item_list[1].desc_pic_url)).apply(RequestOptions.bitmapTransform(RoundedCorners(
roundRadus
))).into(holder.itemView.findViewById(R.id.round_image2))
Glide.with(context).load(Uri.parse(data.order_item_list[0].desc_pic_url)).apply(RequestOptions().transform(
CenterCrop(), RoundedCorners(
DensityUtil.dp2px(roundRadus)))).into(holder.itemView.findViewById(R.id.round_image1))
Glide.with(context).load(Uri.parse( data.order_item_list[1].desc_pic_url)).apply(RequestOptions().transform(
CenterCrop(), RoundedCorners(
DensityUtil.dp2px(roundRadus)))).into(holder.itemView.findViewById(R.id.round_image2))
}
}
else -> {
......@@ -72,15 +74,15 @@ class OrderListAdapter : BaseQuickAdapter<OrderWebData, BaseViewHolder>(R.layout
holder.itemView.findViewById<TextView>(R.id.tv_goog2_name).text = data.order_item_list[1].goods_name
holder.itemView.findViewById<TextView>(R.id.tv_good3_name).text = data.order_item_list[2].goods_name
if (Utils.isWebUrl(data.order_item_list[0].desc_pic_url) && Utils.isWebUrl(data.order_item_list[1].desc_pic_url) && Utils.isWebUrl(data.order_item_list[2].desc_pic_url)) {
Glide.with(context).load(Uri.parse(data.order_item_list[0].desc_pic_url)).apply(RequestOptions.bitmapTransform(RoundedCorners(
roundRadus
))).into(holder.itemView.findViewById(R.id.round_image1))
Glide.with(context).load(Uri.parse(data.order_item_list[1].desc_pic_url)).apply(RequestOptions.bitmapTransform(RoundedCorners(
roundRadus
))).into(holder.itemView.findViewById(R.id.round_image2))
Glide.with(context).load(Uri.parse(data.order_item_list[2].desc_pic_url)).apply(RequestOptions.bitmapTransform(RoundedCorners(
roundRadus
))).into(holder.itemView.findViewById(R.id.round_image3))
Glide.with(context).load(Uri.parse(data.order_item_list[0].desc_pic_url)).apply(RequestOptions().transform(
CenterCrop(), RoundedCorners(
DensityUtil.dp2px(roundRadus)))).into(holder.itemView.findViewById(R.id.round_image1))
Glide.with(context).load(Uri.parse(data.order_item_list[1].desc_pic_url)).apply(RequestOptions().transform(
CenterCrop(), RoundedCorners(
DensityUtil.dp2px(roundRadus)))).into(holder.itemView.findViewById(R.id.round_image2))
Glide.with(context).load(Uri.parse(data.order_item_list[2].desc_pic_url)).apply(RequestOptions().transform(
CenterCrop(), RoundedCorners(
DensityUtil.dp2px(roundRadus)))).into(holder.itemView.findViewById(R.id.round_image3))
}
}
}
......
Components/BUserOrder/src/main/res/layout/border_recycle_order_item.xml
View file @ e00aab1f
......@@ -84,7 +84,6 @@
android:id="@+id/round_image1"
android:layout_width="match_parent"
android:layout_height="@dimen/dp60"
android:scaleType="fitXY"
android:src="@drawable/icon_default_order_pic"
app:radius="@dimen/dp10" />
......@@ -113,7 +112,6 @@
android:id="@+id/round_image2"
android:layout_width="match_parent"
android:layout_height="@dimen/dp60"
android:scaleType="fitXY"
android:src="@drawable/icon_default_order_pic"
app:radius="@dimen/dp10" />
......@@ -142,7 +140,6 @@
android:id="@+id/round_image3"
android:layout_width="match_parent"
android:layout_height="60dp"
android:scaleType="fitXY"
android:src="@drawable/icon_default_order_pic"
app:radius="@dimen/dp10" />
......
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