Skip to content

X
xxsq
Commit 1bffcb39 authored by maxiaoliang's avatar maxiaoliang
Browse files
Options

修改1

parent e7c9e27e
Hide whitespace changes
Inline Side-by-side
Showing with 154 additions and 39 deletions
cms/src/main/java/com/zxhl/cms/net/model/qy/SkillGoodsEntity.kt
View file @ 1bffcb39
......@@ -9,8 +9,8 @@ class SkillGoodsEntity : Serializable {
var goodsId: String? = ""
var goodsType: String? = ""
var skillPrice: String? = ""
var store: Int? = 0
var currentStore: Int? = 0
var store: String? = ""
var currentStore: String? = ""
var status: String? = ""
var skillStatus: String? = ""
var skillStatusDesc: String? = ""
......
moduleMain/src/main/java/com/zxbw/modulemain/activity/FlashSaleActivity.kt
View file @ 1bffcb39
......@@ -10,6 +10,7 @@ import com.zxbw.modulemain.adapter.MoreDiscountAdapter
import com.zxbw.modulemain.adapter.TimeAdapter
import com.zxbw.modulemain.contract.FlashSaleContract
import com.zxbw.modulemain.presenter.FlashSalePresenter
import com.zxbw.modulemain.view.DialogUtils
import com.zxhl.cms.AppContext
import com.zxhl.cms.common.base.BaseActivity
import com.zxhl.cms.net.SettingPreference
......@@ -105,9 +106,17 @@ class FlashSaleActivity : BaseActivity(), FlashSaleContract.View,
mAdapter?.notifyDataSetChanged()
}
override fun toskill(boolean: Boolean, result: ToSkillInfoEntity?) {
override fun toskill(boolean: Boolean, result: ToSkillInfoEntity?, code: String?) {
mPresenter?.getSkillGoodsList(durationId)
// JumpUtils.ToPaySkillJump()
if (!TextUtils.isEmpty(code)) {
if (TextUtils.equals(code, "106")) {
// showToast("已抢光")
DialogUtils.showLootAll(this,View.OnClickListener {
getGoodsList()
})
}
}
if (boolean) {
val user = SettingPreference.getUserInfoData()
......@@ -115,19 +124,20 @@ class FlashSaleActivity : BaseActivity(), FlashSaleContract.View,
if (TextUtils.equals(skillGoodsEntity?.goodsType, "50")) {
val intent = Intent(this, ToPaySkillGoodsActivity::class.java)
intent.putExtra("skillgoods", skillGoodsEntity)
intent.putExtra("type","1")
intent.putExtra("type", "1")
startActivity(intent)
} else if (TextUtils.equals(skillGoodsEntity?.goodsType, "51")) {
//卡券商品
val intent = Intent(mActivity, CardDetailActivity::class.java)
intent.putExtra("cardbean", skillGoodsEntity?.card)
intent.putExtra("type","1")
intent.putExtra("type", "1")
startActivity(intent)
} else if (TextUtils.equals(skillGoodsEntity?.goodsType, "99")) {
//实物商品
mChoosList.clear()
mChoosList.add(skillGoodsEntity?.goods?.id.toString())
val intent = Intent(mActivity, ShopOrderActivity::class.java)
intent.putExtra("type", "1")
intent.putStringArrayListExtra(
"stringList",
mChoosList as java.util.ArrayList<String>?
......
moduleMain/src/main/java/com/zxbw/modulemain/activity/ShopOrderActivity.kt
View file @ 1bffcb39
......@@ -6,6 +6,7 @@ import android.net.http.SslError
import android.os.Handler
import android.text.TextUtils
import android.util.Log
import android.view.KeyEvent
import android.view.View
import android.webkit.*
import androidx.recyclerview.widget.LinearLayoutManager
......@@ -14,6 +15,7 @@ import com.zxbw.modulemain.box.activity.ReceiveAddressActivity
import com.zxbw.modulemain.box.adapter.OrderAdapter
import com.zxbw.modulemain.box.contract.ShopOrderContract
import com.zxbw.modulemain.box.presenter.ShopOrderPresenter
import com.zxbw.modulemain.view.DialogUtils
import com.zxhl.cms.AppContext
import com.zxhl.cms.common.Constant
import com.zxhl.cms.common.NetConfig
......@@ -47,6 +49,7 @@ class ShopOrderActivity : BaseActivity(), ShopOrderContract.View, PayContract.Vi
private var payResultObservable: Observable<PayResultEntity>? = null
private var updateAddress: Observable<Int>? = null
private var mPayPrice: String? = ""
var type: String? = "0"
var addrees: AddressEntity? = null
companion object {
......@@ -76,9 +79,16 @@ class ShopOrderActivity : BaseActivity(), ShopOrderContract.View, PayContract.Vi
val list = intent.getStringArrayListExtra(
"stringList"
)
type= intent.getStringExtra("type")
id_img_back?.setOnClickListener {
finish()
if(TextUtils.equals(type,"1")){
// 在这里，拦截或者监听Android系统的返回键事件。
DialogUtils.showExitSkillBuy(this, View.OnClickListener {
finish()
})
}else{
finish()
}
}
mPayFunAdapter = PaymentFunAdapter(
......@@ -616,5 +626,20 @@ class ShopOrderActivity : BaseActivity(), ShopOrderContract.View, PayContract.Vi
id_shop_pay_web_view.loadUrl(NetConfig.H5.WEB_URL_H5_PAY)
}
override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
if (keyCode == KeyEvent.KEYCODE_BACK) {
if(TextUtils.equals(type,"1")){
// 在这里，拦截或者监听Android系统的返回键事件。
DialogUtils.showExitSkillBuy(this, View.OnClickListener {
finish()
})
}else{
finish()
}
}
return false
}
}
\ No newline at end of file
moduleMain/src/main/java/com/zxbw/modulemain/adapter/FlashSaleAdapter.kt
View file @ 1bffcb39
......@@ -25,6 +25,7 @@ import com.zxhl.cms.widget.RecycleImageView
class FlashSaleAdapter : BaseRecyclerAdapter<SkillGoodsEntity, FlashSaleAdapter.ViewHolder> {
private var mContext: Activity? = null
private val listener: OnRecycleItemClickListener<SkillGoodsEntity>
constructor(
content: Activity?,
listener: OnRecycleItemClickListener<SkillGoodsEntity>
......@@ -35,27 +36,43 @@ class FlashSaleAdapter : BaseRecyclerAdapter<SkillGoodsEntity, FlashSaleAdapter.
override fun onBindViewHolder(holder: ViewHolder, position: Int) {
var bean = mList[position]
if(TextUtils.equals(bean.skillStatus,"1")||TextUtils.equals(bean.skillStatus,"2")){
holder.id_tv_qianggou?.setBackgroundResource(R.drawable.button_qiang)
}else{
if (TextUtils.equals(bean.skillStatus, "1") || TextUtils.equals(bean.skillStatus, "2")) {
if (!TextUtils.isEmpty(bean.currentStore)) {
if (bean.currentStore!!.toInt() > 0) {
holder.id_tv_qianggou?.setBackgroundResource(R.drawable.button_qiang)
}else{
holder.id_tv_qianggou?.setBackgroundResource(R.drawable.button_bukeqiang)
}
}
} else {
holder.id_tv_qianggou?.setBackgroundResource(R.drawable.button_bukeqiang)
}
holder.goumai_progress?.max=bean.store!!
holder.goumai_progress?.progress=bean.currentStore!!
holder.id_tv_status?.text=bean.skillStatusDesc
if(!TextUtils.equals(bean.goodsType,"99")){
holder.id_img_member_bg?.setLoadImageUrl(bean.icon,false)
if(!TextUtils.isEmpty(bean.store)){
holder.goumai_progress?.max = bean.store!!.toInt()
holder.goumai_progress?.progress = bean.currentStore!!.toInt()
}
holder.id_tv_status?.text = bean.skillStatusDesc
if(!TextUtils.isEmpty(bean.currentStore)){
if(bean.currentStore!!.toInt()<=0){
holder.id_tv_status?.text = "已抢光"
}
}
if (!TextUtils.equals(bean.goodsType, "99")) {
holder.id_tv_name?.text="${bean.card?.brand}${bean.card?.category}${bean.card?.goodsName}"
holder.id_tv_sale_price?.text="${bean.skillPrice}"
holder.id_tv_yuanjia?.text="${bean.card?.originPrice}"
holder.id_img_member_bg?.setLoadImageUrl(bean.icon, false)
// holder.id_img_icon?.setLoadImageUrl(bean.card?.icon, false)
holder.id_tv_name?.text =
"${bean.card?.brand}${bean.card?.category}${bean.card?.goodsName}"
holder.id_tv_sale_price?.text = "${bean.skillPrice}"
holder.id_tv_yuanjia?.text = "${bean.card?.originPrice}"
}else{
holder.id_img_member_bg?.setLoadImageUrl(bean.goods?.mainImage,false)
holder.id_tv_name?.text="${bean.goods?.productName}"
holder.id_tv_sale_price?.text="${bean.goods?.salePriceStr}"
holder.id_tv_yuanjia?.text="${bean.goods?.originalPriceDb}"
} else {
holder.id_img_member_bg?.setLoadImageUrl(bean.goods?.mainImage, false)
holder.id_tv_name?.text = "${bean.goods?.productName}"
holder.id_tv_sale_price?.text = "${bean.goods?.salePriceStr}"
holder.id_tv_yuanjia?.text = "${bean.goods?.originalPriceDb}"
}
holder.id_tv_yuanjia?.getPaint()?.setFlags(Paint.STRIKE_THRU_TEXT_FLAG) //中划线
......@@ -65,8 +82,8 @@ class FlashSaleAdapter : BaseRecyclerAdapter<SkillGoodsEntity, FlashSaleAdapter.
// mContext?.startActivity(intent)
// }
holder.id_ll_item?.setOnClickListener {
if(TextUtils.equals(bean.status,"1")||TextUtils.equals(bean.status,"2")){
listener.onItemClick(it,position,bean)
if (TextUtils.equals(bean.status, "1") || TextUtils.equals(bean.status, "2")) {
listener.onItemClick(it, position, bean)
}
}
......@@ -92,17 +109,20 @@ class FlashSaleAdapter : BaseRecyclerAdapter<SkillGoodsEntity, FlashSaleAdapter.
class ViewHolder : RecyclerView.ViewHolder {
var id_ll_item: LinearLayout?
var id_img_member_bg: RecycleImageView?
var id_tv_name:TextView?
var id_tv_sale_price:TextView?
var id_tv_yuanjia:TextView?
var id_tv_status:TextView?
var id_tv_qianggou:TextView?
// var id_img_icon: RecycleImageView?
var id_tv_name: TextView?
var id_tv_sale_price: TextView?
var id_tv_yuanjia: TextView?
var id_tv_status: TextView?
var id_tv_qianggou: TextView?
var goumai_progress: ProgressBar?
constructor(
itemView: View
) : super(itemView) {
id_ll_item = itemView.findViewById(R.id.id_ll_item)
id_img_member_bg = itemView.findViewById(R.id.id_img_member_bg)
// id_img_icon = itemView.findViewById(R.id.id_img_icon)
id_tv_name = itemView.findViewById(R.id.id_tv_name)
id_tv_sale_price = itemView.findViewById(R.id.id_tv_sale_price)
id_tv_yuanjia = itemView.findViewById(R.id.id_tv_yuanjia)
......
moduleMain/src/main/java/com/zxbw/modulemain/contract/FlashSaleContract.kt
View file @ 1bffcb39
......@@ -8,7 +8,7 @@ class FlashSaleContract {
interface View {
fun setData(result:List<SkillEntity>?)
fun setSkillListResult(result: List<SkillGoodsEntity>?)
fun toskill(boolean: Boolean,result: ToSkillInfoEntity?)
fun toskill(boolean: Boolean,result: ToSkillInfoEntity?,code:String?)
fun setMoreResult(result:List<SkillGoodsEntity>?)
}
......
moduleMain/src/main/java/com/zxbw/modulemain/presenter/FlashSalePresenter.kt
View file @ 1bffcb39
package com.zxbw.modulemain.presenter
import android.text.TextUtils
import android.util.Log
import com.zxbw.modulemain.contract.FlashSaleContract
import com.zxhl.cms.net.ApiClient
import com.zxhl.cms.net.RxSchedulers
......@@ -46,11 +48,11 @@ class FlashSalePresenter : FlashSaleContract.Presenter {
ApiClient.homeApi.beginskill(durationId, id).compose(RxSchedulers.observableIO2Main())
.subscribe(object : BaseObserver<ToSkillInfoEntity>() {
override fun onSuccess(result: ToSkillInfoEntity?) {
mView?.toskill(true, result)
mView?.toskill(true, result,"")
}
override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
mView?.toskill(false, null)
mView?.toskill(false, null,code)
}
})
}
......
moduleMain/src/main/java/com/zxbw/modulemain/view/DialogUtils.kt
View file @ 1bffcb39
......@@ -398,9 +398,9 @@ object DialogUtils {
}
//退出挽留弹窗
fun showExitSkillBuy(context: Activity?, listener: View.OnClickListener) {
if (context == null) return
val mDialog = Dialog(context, R.style.CenterCompatDialogTheme)
val mDialogView =
if (context == null) return
val mDialog = Dialog(context, R.style.CenterCompatDialogTheme)
val mDialogView =
showBottomDialog(
R.layout.dialog_layout_exit_skill_buy,
context,
......@@ -420,5 +420,24 @@ object DialogUtils {
mDialog.setCancelable(false)
mDialog.show()
}
fun showLootAll(context: Activity?,listener: View.OnClickListener){
if (context == null) return
val mDialog = Dialog(context, R.style.CenterCompatDialogTheme)
val mDialogView =
showBottomDialog(
R.layout.dialog_layout_loot_all,
context,
mDialog,
0,
Gravity.CENTER
)
mDialogView.findViewById<ImageView>(R.id.id_img_i_know).setOnClickListener {
listener.onClick(it)
mDialog.dismiss()
}
mDialog.setCanceledOnTouchOutside(false)
mDialog.setCancelable(false)
mDialog.show()
}
}
\ No newline at end of file
moduleMain/src/main/res/layout/dialog_layout_exit_skill_buy.xml
View file @ 1bffcb39
......@@ -15,7 +15,7 @@
android:src="@drawable/bg_dialog_exit_buy" />
<LinearLayout
android:layout_width="296dp"
android:layout_width="240dp"
android:layout_height="68dp"
android:layout_alignBottom="@+id/id_img_bg"
android:gravity="center">
......
moduleMain/src/main/res/layout/dialog_layout_loot_all.xml 0 → 100644
View file @ 1bffcb39
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/icon_tanchuang"
android:orientation="vertical"
android:gravity="center_horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="116dp"
android:text="很遗憾"
android:textColor="@color/color_333333"
android:textSize="20sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="被抢光了，下次再来吧～"
android:layout_marginTop="15dp"
android:textColor="@color/color_666666"
android:textSize="16sp" />
<ImageView
android:id="@+id/id_img_i_know"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="30dp"
android:src="@drawable/button_wozhidaol"/>
</LinearLayout>
</LinearLayout>
moduleMain/src/main/res/layout/item_layout_sale_flash_top.xml
View file @ 1bffcb39
......@@ -20,6 +20,8 @@
android:layout_centerHorizontal="true"
android:layout_marginTop="13dp" />
<TextView
android:id="@+id/id_tv_name"
android:layout_width="90dp"
......@@ -91,8 +93,8 @@
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="50dp"
android:layout_height="6dp"
android:layout_marginLeft="4dp"
android:layout_below="@id/id_tv_status"
android:layout_marginLeft="4dp"
android:layout_marginTop="8dp"
android:progressDrawable="@drawable/shape_process_skill_bug" />
......
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