Skip to content

X
xxsq
Commit 8da58e26 authored by 王雪伟's avatar 王雪伟
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 0c424149 e0d7cc9b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 681 additions and 1 deletion
cms/src/main/java/com/zxhl/cms/router/RounterApi.kt
View file @ 8da58e26
...@@ -249,6 +249,10 @@ interface RounterApi { ...@@ -249,6 +249,10 @@ interface RounterApi {
@RounterUri(Constant.scheme + "://cardvoucher") @RounterUri(Constant.scheme + "://cardvoucher")
fun getIntentCardVoucher(): Intent fun getIntentCardVoucher(): Intent
@RounterUri(Constant.scheme + "://carddetail") @RounterUri(Constant.scheme + "://carddetail")
fun getIntentCardDetail(): Intent fun getIntentCardDetail(): Intent
@RounterUri(Constant.scheme + "://flashsale")
fun getIntentFlashSale(): Intent
} }
\ No newline at end of file
cms/src/main/java/com/zxhl/cms/utils/JumpUtils.java
View file @ 8da58e26
...@@ -369,4 +369,13 @@ public class JumpUtils { ...@@ -369,4 +369,13 @@ public class JumpUtils {
Utils.showToast(AppContext.get(), "该版本暂不支持，请更新版本！"); Utils.showToast(AppContext.get(), "该版本暂不支持，请更新版本！");
} }
} }
public static void FlashSaleJump() {
try {
Intent intent = RounterBus.getRounter(RounterApi.class).getIntentFlashSale();
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
AppContext.get().startActivity(intent);
} catch (Exception e) {
Utils.showToast(AppContext.get(), "该版本暂不支持，请更新版本！");
}
}
} }
moduleMain/src/main/AndroidManifest.xml
View file @ 8da58e26
...@@ -57,7 +57,17 @@ ...@@ -57,7 +57,17 @@
android:scheme="xxsq" /> android:scheme="xxsq" />
</intent-filter> </intent-filter>
</activity> </activity>
<activity android:name=".activity.FlashSaleActivity">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<data
android:host="flashsale"
android:scheme="xxsq" />
</intent-filter>
</activity>
<activity android:name=".activity.RightsDetailActivity"> <activity android:name=".activity.RightsDetailActivity">
<intent-filter> <intent-filter>
......
moduleMain/src/main/java/com/zxbw/modulemain/activity/FlashSaleActivity.kt 0 → 100644
View file @ 8da58e26
package com.zxbw.modulemain.activity
import android.view.View
import androidx.recyclerview.widget.GridLayoutManager
import com.zxbw.modulemain.R
import com.zxbw.modulemain.adapter.FlashSaleAdapter
import com.zxbw.modulemain.adapter.MoreDiscountAdapter
import com.zxbw.modulemain.contract.FlashSaleContract
import com.zxbw.modulemain.presenter.FlashSalePresenter
import com.zxhl.cms.AppContext
import com.zxhl.cms.common.base.BaseActivity
import kotlinx.android.synthetic.main.activity_layout_flash_sale.*
class FlashSaleActivity:BaseActivity(),FlashSaleContract.View {
private var mPresenter:FlashSalePresenter?=null
private var mAdapter:FlashSaleAdapter?=null
private var mDiscountAdapter:MoreDiscountAdapter?=null
override fun onClick(v: View?) {
}
override fun before() {
super.before()
setStatusBarBackground(AppContext.get().resources.getColor(R.color.transparent))
}
override fun layoutID(): Int {
return R.layout.activity_layout_flash_sale
}
override fun init() {
mPresenter= FlashSalePresenter(this)
mAdapter= FlashSaleAdapter(this)
mDiscountAdapter= MoreDiscountAdapter(this)
id_rl_more_discount?.layoutManager=GridLayoutManager(this,3)
id_rl_more_discount?.adapter=mDiscountAdapter
id_rl_flash_sale_top?.layoutManager=GridLayoutManager(this,3)
id_rl_flash_sale_top?.adapter=mAdapter
}
override fun setData() {
}
}
\ No newline at end of file
moduleMain/src/main/java/com/zxbw/modulemain/adapter/FlashSaleAdapter.kt 0 → 100644
View file @ 8da58e26
package com.zxbw.modulemain.adapter
import android.app.Activity
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.LinearLayout
import androidx.recyclerview.widget.RecyclerView
import com.zxbw.modulemain.R
import com.zxhl.cms.AppContext
import com.zxhl.cms.common.base.BaseRecyclerAdapter
class FlashSaleAdapter : BaseRecyclerAdapter<Any, FlashSaleAdapter.ViewHolder> {
private var mContext: Activity? = null
constructor(
content: Activity?
) : super() {
mContext = content
}
override fun onBindViewHolder(holder: ViewHolder, position: Int) {
holder.id_ll_item?.setOnClickListener {
}
}
override fun getItemCount(): Int {
return 3
}
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
return ViewHolder(
LayoutInflater.from(AppContext.get())
.inflate(R.layout.item_layout_sale_flash_top, parent, false)
)
}
class ViewHolder : RecyclerView.ViewHolder {
var id_ll_item: LinearLayout?
constructor(
itemView: View
) : super(itemView) {
id_ll_item =
itemView.findViewById<LinearLayout>(R.id.id_ll_item)
}
}
}
\ No newline at end of file
moduleMain/src/main/java/com/zxbw/modulemain/adapter/MoreDiscountAdapter.kt 0 → 100644
View file @ 8da58e26
package com.zxbw.modulemain.adapter
import android.app.Activity
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.LinearLayout
import androidx.recyclerview.widget.RecyclerView
import com.zxbw.modulemain.R
import com.zxhl.cms.AppContext
import com.zxhl.cms.common.base.BaseRecyclerAdapter
class MoreDiscountAdapter : BaseRecyclerAdapter<Any, MoreDiscountAdapter.ViewHolder> {
private var mContext: Activity? = null
constructor(
content: Activity?
) : super() {
mContext = content
}
override fun onBindViewHolder(holder: ViewHolder, position: Int) {
holder.id_ll_item?.setOnClickListener {
}
}
override fun getItemCount(): Int {
return 30
}
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
return ViewHolder(
LayoutInflater.from(AppContext.get())
.inflate(R.layout.item_layout_more_discount, parent, false)
)
}
class ViewHolder : RecyclerView.ViewHolder {
var id_ll_item: LinearLayout?
constructor(
itemView: View
) : super(itemView) {
id_ll_item =
itemView.findViewById<LinearLayout>(R.id.id_ll_item)
}
}
}
\ No newline at end of file
moduleMain/src/main/java/com/zxbw/modulemain/contract/FlashSaleContract.kt 0 → 100644
View file @ 8da58e26
package com.zxbw.modulemain.contract
class FlashSaleContract {
interface View {
fun setData()
}
interface Presenter {
fun getFlashSaleData()
}
}
\ No newline at end of file
moduleMain/src/main/java/com/zxbw/modulemain/fragment/UserCenterFragment.kt
View file @ 8da58e26
...@@ -41,7 +41,7 @@ class UserCenterFragment : BaseFragment(), AdCallback<String> { ...@@ -41,7 +41,7 @@ class UserCenterFragment : BaseFragment(), AdCallback<String> {
JumpUtils.webJump("用户协议", NetConfig.H5.WEB_URL_USER) JumpUtils.webJump("用户协议", NetConfig.H5.WEB_URL_USER)
} }
id_ll_my_warehouse?.setOnClickListener { id_ll_my_warehouse?.setOnClickListener {
JumpUtils.FlashSaleJump()
} }
id_ll_shangwu_hezuo?.setOnClickListener { id_ll_shangwu_hezuo?.setOnClickListener {
......
moduleMain/src/main/java/com/zxbw/modulemain/presenter/FlashSalePresenter.kt 0 → 100644
View file @ 8da58e26
package com.zxbw.modulemain.presenter
import com.zxbw.modulemain.contract.FlashSaleContract
class FlashSalePresenter:FlashSaleContract.Presenter {
private val mView: FlashSaleContract.View
constructor(mView: FlashSaleContract.View) {
this.mView = mView
}
override fun getFlashSaleData() {
}
}
\ No newline at end of file
moduleMain/src/main/res/drawable/shape_b11a29_r10.xml 0 → 100644
View file @ 8da58e26
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#ffb11a29" />
<corners
android:bottomLeftRadius="10dp"
android:bottomRightRadius="10dp"
android:topLeftRadius="10dp"
android:topRightRadius="10dp" />
</shape>
\ No newline at end of file
moduleMain/src/main/res/drawable/shape_de2535_bg.xml 0 → 100644
View file @ 8da58e26
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#ffde2535" />
<corners
android:bottomLeftRadius="0dp"
android:bottomRightRadius="0dp"
android:topLeftRadius="10dp"
android:topRightRadius="10dp" />
<item android:name="android:shadowColor">#e6b11a29</item>
<item android:name="android:shadowDx">0</item>
<item android:name="android:shadowDy">3</item>
</shape>
\ No newline at end of file
moduleMain/src/main/res/layout/activity_layout_flash_sale.xml 0 → 100644
View file @ 8da58e26
This diff is collapsed.
moduleMain/src/main/res/layout/item_layout_more_discount.xml 0 → 100644
View file @ 8da58e26
<?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="wrap_content"
android:layout_marginLeft="2dp"
android:layout_marginRight="2dp"
android:orientation="vertical">
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/beijing_1"
android:orientation="vertical">
<ImageView
android:id="@+id/id_img_member_bg"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="13dp"
android:src="@drawable/icon_huangse" />
<TextView
android:id="@+id/id_tv_name"
android:layout_width="90dp"
android:layout_height="wrap_content"
android:layout_below="@+id/id_img_member_bg"
android:layout_centerHorizontal="true"
android:layout_marginLeft="4dp"
android:layout_marginTop="20dp"
android:lines="1"
android:text="优酷会员黄…"
android:textColor="@color/color_333333"
android:textSize="12sp" />
<LinearLayout
android:id="@+id/id_ll_middle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/id_tv_name"
android:layout_marginLeft="4dp"
android:layout_marginTop="2dp"
android:layout_marginRight="4dp"
android:layout_marginBottom="2dp"
android:gravity="center_vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="¥"
android:textColor="@color/color_999999"
android:textSize="10sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="2dp"
android:layout_marginRight="4dp"
android:layout_weight="1"
android:text="20"
android:textColor="@color/color_999999"
android:textSize="10sp"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="日常价"
android:textColor="@color/color_999999"
android:textSize="10sp" />
</LinearLayout>
<ImageView
android:id="@+id/id_huodonhua"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/id_ll_middle"
android:layout_centerHorizontal="true"
android:src="@drawable/huodongjia" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/id_huodonhua"
android:layout_marginTop="6dp"
android:text="¥12.9"
android:textSize="10sp"
android:gravity="center"
android:textColor="@color/white"
android:layout_centerHorizontal="true"
android:background="@drawable/button_anniu"/>
</RelativeLayout>
</LinearLayout>
moduleMain/src/main/res/layout/item_layout_sale_flash_top.xml 0 → 100644
View file @ 8da58e26
<?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="wrap_content"
android:layout_marginLeft="2dp"
android:layout_marginRight="2dp"
android:orientation="vertical">
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/beijing_1"
android:orientation="vertical">
<ImageView
android:id="@+id/id_img_member_bg"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="13dp"
android:src="@drawable/icon_huangse" />
<TextView
android:id="@+id/id_tv_name"
android:layout_width="90dp"
android:layout_height="wrap_content"
android:layout_below="@+id/id_img_member_bg"
android:layout_centerHorizontal="true"
android:layout_marginLeft="4dp"
android:layout_marginTop="20dp"
android:lines="1"
android:text="喜马拉雅VIP会…"
android:textColor="@color/color_333333"
android:textSize="12sp" />
<LinearLayout
android:id="@+id/id_ll_middle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/id_tv_name"
android:layout_marginLeft="4dp"
android:layout_marginTop="2dp"
android:layout_marginRight="4dp"
android:layout_marginBottom="2dp"
android:gravity="center_vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="¥"
android:textColor="#F22B52"
android:textSize="12sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="2dp"
android:layout_marginRight="4dp"
android:text="9.9"
android:textColor="#F22B52"
android:textSize="18sp"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="¥20"
android:textColor="@color/color_999999"
android:textSize="10sp" />
</LinearLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/id_ll_middle">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="未开始"
android:textColor="@color/color_999999"
android:textSize="12sp" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="10dp"
android:layout_marginBottom="10dp"
android:background="@drawable/button_qiang"
android:gravity="center"
android:text="抢"
android:textColor="@color/white"
android:textSize="14sp"
android:textStyle="bold" />
</RelativeLayout>
</RelativeLayout>
</LinearLayout>
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