Skip to content

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

11

parent 9fdfaddb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 516 additions and 121 deletions
app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted 100644 → 0
View file @ 9fdfaddb
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
</adaptive-icon>
\ No newline at end of file
cms/src/main/java/com/zxhl/cms/common/NetConfig.java
View file @ cde0a212
......@@ -191,11 +191,11 @@ public class NetConfig {
}
public static class H5 {
public static String WEB_URL_USER = "https://newspool.zhangxinhulian.com/sspapiNovel/su/custom/xingyunmohe/userAgree.html?version=" + Constant.Param.vn + "&appName=幸运魔盒&company=北京志信博文科技发展有限公司";
public static String WEB_URL_USER = "https://newspool.zhangxinhulian.com/sspapiNovel/su/custom/xiaoxiangSaveMoney/person_app.html?webName=小象省钱";
public static String WEB_URL_PRIVACY = "https://newspool.zhangxinhulian.com/sspapiNovel/su/custom/xingyunmohe/privacy.html?version=" + Constant.Param.vn + "&appName=幸运魔盒&company=北京志信博文科技发展有限公司";
public static String WEB_URL_PRIVACY = "https://newspool.zhangxinhulian.com/sspapiNovel/su/custom/xiaoxiangSaveMoney/privacy_app.html?appName=小象省钱APP&company=北京志信博文科技发展有限公司&money=虚拟货币&webName=小象省钱";
public static String WEB_URL_ABOUT_US = "https://newspool.zhangxinhulian.com/sspapiNovel/su/custom/xingyunmohe/aboutMe.html?version=" + Constant.Param.vn + "&appName=幸运魔盒&company=北京志信博文科技发展有限公司";
public static String WEB_URL_ABOUT_US = "https://newspool.zhangxinhulian.com/sspapiNovel/su/custom/xingyunmohe/aboutMe.html?version=" + Constant.Param.vn + "&appName=小象省钱&company=北京志信博文科技发展有限公司";
public static String WEB_URL_CUSTOMER_SERVICE = "https://1568685.s4.udesk.cn/im_client/?web_plugin_id=25351";
public static String WEB_URL_ZENGZHI_SERVICE = "https://newspool.zhangxinhulian.com/sspapiNovel/su/custom/xingyunmohe/xxsq_zz_server.html";
......@@ -277,6 +277,7 @@ public class NetConfig {
}
public static class FlashSale{
public static final String HOME_FLASH_SALE_SKILL = "app/v1/game/xiaoxiang/skill";//秒杀时间表
public static final String HOME_FLASH_SALE_SKILL_LIST = "app/v1/game/xiaoxiang/skill/list";//秒杀商品列表
}
......
cms/src/main/java/com/zxhl/cms/net/api/IHomeApi.kt
View file @ cde0a212
......@@ -374,8 +374,10 @@ interface IHomeApi {
@GET(NetConfig.QY.XX_HOME_BANNER)
fun getHomeBanner(): Observable<Response<List<HomeBannerEntity>>>
//图文详情
//秒杀时间表
@GET(NetConfig.FlashSale.HOME_FLASH_SALE_SKILL)
fun getskill(): Observable<Response<List<SkillEntity>>>
//秒杀商品列表
@POST(NetConfig.FlashSale.HOME_FLASH_SALE_SKILL_LIST)
fun getskillGoodsList( @Query("durationId") durationId: String?): Observable<Response<List<SkillGoodsEntity>>>
}
\ No newline at end of file
cms/src/main/java/com/zxhl/cms/net/model/qy/JgqQyEntity.kt
View file @ cde0a212
......@@ -10,4 +10,5 @@ class JgqQyEntity {
var sort: String? = ""
var icon: String? = ""
var maxDiscount: String? = ""
var rechargeType: String? = ""
}
\ No newline at end of file
cms/src/main/java/com/zxhl/cms/net/model/qy/SkillGoodsEntity.kt 0 → 100644
View file @ cde0a212
package com.zxhl.cms.net.model.qy
import java.io.Serializable
class SkillGoodsEntity : Serializable {
var id: String? = ""
var time: String? = ""
var goodsId: String? = ""
var goodsType: String? = ""
var skillPrice: String? = ""
var store: String? = ""
var status: String? = ""
var sort: String? = ""
var card: CardEntity? = null
}
class CardEntity : Serializable{
var id: String? = ""
var brand: String? = ""
var category: String? = ""
var rechargeType: String? = ""
var goodsName: String? = ""
var originPrice: String? = ""
var costPrice: String? = ""
var costDiscount: String? = ""
var salePrice: String? = ""
var skillPrice: String? = ""
var remark: String? = ""
var purchaseTime: String? = ""
var status: String? = ""
var productCode: String? = ""
}
cms/src/main/java/com/zxhl/cms/router/RounterApi.kt
View file @ cde0a212
......@@ -258,4 +258,13 @@ interface RounterApi {
@RounterUri(Constant.scheme + "://withdrawal")
fun getIntentWithdrawal(): Intent
@RounterUri(Constant.scheme + "://buymember")
fun getIntentBuyMember(): Intent
@RounterUri(Constant.scheme + "://configbuyvip")
fun getIntentConfigBuy(): Intent
@RounterUri(Constant.scheme + "://abuoutus")
fun getIntentAboutUs(): Intent
}
\ No newline at end of file
cms/src/main/java/com/zxhl/cms/utils/JumpUtils.java
View file @ cde0a212
......@@ -369,6 +369,7 @@ public class JumpUtils {
Utils.showToast(AppContext.get(), "该版本暂不支持，请更新版本！");
}
}
public static void FlashSaleJump() {
try {
Intent intent = RounterBus.getRounter(RounterApi.class).getIntentFlashSale();
......@@ -378,6 +379,7 @@ public class JumpUtils {
Utils.showToast(AppContext.get(), "该版本暂不支持，请更新版本！");
}
}
public static void WithdrawalJump() {
try {
Intent intent = RounterBus.getRounter(RounterApi.class).getIntentWithdrawal();
......@@ -387,4 +389,33 @@ public class JumpUtils {
Utils.showToast(AppContext.get(), "该版本暂不支持，请更新版本！");
}
}
public static void BuyMemberJump() {
try {
Intent intent = RounterBus.getRounter(RounterApi.class).getIntentBuyMember();
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
AppContext.get().startActivity(intent);
} catch (Exception e) {
Utils.showToast(AppContext.get(), "该版本暂不支持，请更新版本！");
}
}
public static void ConfigBuyJump() {
try {
Intent intent = RounterBus.getRounter(RounterApi.class).getIntentConfigBuy();
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
AppContext.get().startActivity(intent);
} catch (Exception e) {
Utils.showToast(AppContext.get(), "该版本暂不支持，请更新版本！");
}
}
public static void AbuoutUsJump() {
try {
Intent intent = RounterBus.getRounter(RounterApi.class).getIntentAboutUs();
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 @ cde0a212
......@@ -79,6 +79,50 @@
android:scheme="xxsq" />
</intent-filter>
</activity>
<activity android:name=".activity.SkillPayActivity">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<data
android:host="skillpay"
android:scheme="xxsq" />
</intent-filter>
</activity>
<activity android:name=".activity.BuyMemberActivity">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<data
android:host="buymember"
android:scheme="xxsq" />
</intent-filter>
</activity>
<activity android:name=".activity.CofigBugVipActivity">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<data
android:host="configbuyvip"
android:scheme="xxsq" />
</intent-filter>
</activity>
<activity android:name=".activity.AbuoutUsActivity">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<data
android:host="abuoutus"
android:scheme="xxsq" />
</intent-filter>
</activity>
<activity android:name=".activity.RightsDetailActivity">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
......
moduleMain/src/main/java/com/zxbw/modulemain/activity/AbuoutUsActivity.kt 0 → 100644
View file @ cde0a212
package com.zxbw.modulemain.activity
import android.view.View
import com.zxbw.modulemain.R
import com.zxhl.cms.AppContext
import com.zxhl.cms.common.Constant
import com.zxhl.cms.common.base.BaseActivity
import kotlinx.android.synthetic.main.activity_layout_abuout_us.*
class AbuoutUsActivity:BaseActivity() {
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_abuout_us
}
override fun init() {
id_tv_version?.text="版本号：V${Constant.Param.vn}"
}
}
\ No newline at end of file
moduleMain/src/main/java/com/zxbw/modulemain/activity/CofigBugVipActivity.kt
View file @ cde0a212
package com.zxbw.modulemain.activity
import android.view.View
import com.zxbw.modulemain.R
import com.zxhl.cms.AppContext
import com.zxhl.cms.common.base.BaseActivity
class CofigBugVipActivity:BaseActivity() {
......@@ -9,10 +11,13 @@ class CofigBugVipActivity:BaseActivity() {
}
override fun layoutID(): Int {
TODO("Not yet implemented")
return R.layout.activity_layout_cofig_buy_vip
}
override fun before() {
super.before()
setStatusBarBackground(AppContext.get().resources.getColor(R.color.transparent))
}
override fun init() {
TODO("Not yet implemented")
}
}
\ No newline at end of file
moduleMain/src/main/java/com/zxbw/modulemain/activity/FlashSaleActivity.kt
View file @ cde0a212
......@@ -11,6 +11,7 @@ import com.zxbw.modulemain.presenter.FlashSalePresenter
import com.zxhl.cms.AppContext
import com.zxhl.cms.common.base.BaseActivity
import com.zxhl.cms.net.model.qy.SkillEntity
import com.zxhl.cms.net.model.qy.SkillGoodsEntity
import com.zxhl.cms.utils.OnRecycleItemClickListener
import kotlinx.android.synthetic.main.activity_layout_flash_sale.*
......@@ -19,6 +20,7 @@ class FlashSaleActivity:BaseActivity(),FlashSaleContract.View,OnRecycleItemClick
private var mAdapter:FlashSaleAdapter?=null
private var mDiscountAdapter:MoreDiscountAdapter?=null
private var mTimeAdapter: TimeAdapter?=null
private var durationId:String?=""
override fun onClick(v: View?) {
}
......@@ -31,6 +33,9 @@ class FlashSaleActivity:BaseActivity(),FlashSaleContract.View,OnRecycleItemClick
}
override fun init() {
id_img_back?.setOnClickListener {
finish()
}
mPresenter= FlashSalePresenter(this)
mAdapter= FlashSaleAdapter(this)
mTimeAdapter= TimeAdapter(this,this)
......@@ -42,6 +47,7 @@ class FlashSaleActivity:BaseActivity(),FlashSaleContract.View,OnRecycleItemClick
id_rl_flash_sale_top?.layoutManager=GridLayoutManager(this,3)
id_rl_flash_sale_top?.adapter=mAdapter
mPresenter?.getFlashSaleData()
//
}
......@@ -49,9 +55,22 @@ class FlashSaleActivity:BaseActivity(),FlashSaleContract.View,OnRecycleItemClick
mTimeAdapter?.clear()
mTimeAdapter?.appendToList(result)
mTimeAdapter?.notifyDataSetChanged()
durationId=result?.get(1)?.id
mPresenter?.getSkillGoodsList("08")
}
override fun setSkillListResult(result: List<SkillGoodsEntity>?) {
mAdapter?.clear()
mAdapter?.appendToList(result)
mAdapter?.notifyDataSetChanged()
}
override fun onItemClick(view: View?, position: Int, data: SkillEntity?) {
showToast("点击"+data?.startTime)
durationId=data?.startTime
}
fun getGoodsList(){
mPresenter?.getSkillGoodsList(durationId)
}
}
\ No newline at end of file
moduleMain/src/main/java/com/zxbw/modulemain/activity/SkillPayActivity.kt
View file @ cde0a212
package com.zxbw.modulemain.activity
import android.graphics.Paint
import android.view.View
import com.zxbw.modulemain.R
import com.zxhl.cms.AppContext
import com.zxhl.cms.common.base.BaseActivity
import com.zxhl.cms.net.model.qy.SkillGoodsEntity
import com.zxhl.cms.utils.JumpUtils
import kotlinx.android.synthetic.main.activity_layout_skill_pay.*
class SkillPayActivity:BaseActivity() {
//秒杀商品去支付
class SkillPayActivity : BaseActivity() {
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_skill_pay
return R.layout.activity_layout_skill_pay
}
override fun init() {
id_img_back?.setOnClickListener {
finish()
}
val skillGoodsEntity: SkillGoodsEntity =
intent.getSerializableExtra("skillgoods") as SkillGoodsEntity
setDataView(skillGoodsEntity)
id_ll_no_vip?.setOnClickListener {
JumpUtils.BuyMemberJump()
}
}
fun setDataView(entity: SkillGoodsEntity) {
id_title_name?.text =
"${entity?.card?.brand}${entity?.card?.category}${entity?.card?.goodsName}"
id_tv_goods_name?.text =
"${entity?.card?.brand}${entity?.card?.category}${entity?.card?.goodsName}"
id_tv_member_discount?.text = "会员专享${entity?.card?.costDiscount}折"
id_tv_sale_price?.text = "${entity?.skillPrice}"
id_tv_orgin_price?.text = " ¥ ${entity?.card?.originPrice}"
id_tv_orgin_price?.getPaint()?.setFlags(Paint.STRIKE_THRU_TEXT_FLAG) //中划线
}
}
\ No newline at end of file
moduleMain/src/main/java/com/zxbw/modulemain/adapter/FlashSaleAdapter.kt
View file @ cde0a212
package com.zxbw.modulemain.adapter
import android.app.Activity
import android.content.Intent
import android.graphics.Paint
import android.text.TextUtils
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.ImageView
import android.widget.LinearLayout
import android.widget.ProgressBar
import android.widget.TextView
import androidx.recyclerview.widget.RecyclerView
import com.zxbw.modulemain.R
import com.zxbw.modulemain.activity.CardDetailActivity
import com.zxbw.modulemain.activity.SkillPayActivity
import com.zxhl.cms.AppContext
import com.zxhl.cms.common.base.BaseRecyclerAdapter
import com.zxhl.cms.net.model.qy.SkillGoodsEntity
class FlashSaleAdapter : BaseRecyclerAdapter<Any, FlashSaleAdapter.ViewHolder> {
class FlashSaleAdapter : BaseRecyclerAdapter<SkillGoodsEntity, FlashSaleAdapter.ViewHolder> {
private var mContext: Activity? = null
constructor(
......@@ -20,14 +29,34 @@ class FlashSaleAdapter : BaseRecyclerAdapter<Any, FlashSaleAdapter.ViewHolder> {
}
override fun onBindViewHolder(holder: ViewHolder, position: Int) {
var bean = mList[position]
if(TextUtils.equals(bean.status,"0")){
}else{
}
holder.goumai_progress?.max=100
holder.goumai_progress?.progress=10
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_tv_yuanjia?.getPaint()?.setFlags(Paint.STRIKE_THRU_TEXT_FLAG) //中划线
holder.id_ll_item?.setOnClickListener {
val intent = Intent(mContext, SkillPayActivity::class.java)
intent.putExtra("skillgoods", bean)
mContext?.startActivity(intent)
}
}
override fun getItemCount(): Int {
return 3
val size = mList.size
if (size > 3) {
return 3
} else {
return size
}
}
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
......@@ -39,14 +68,24 @@ class FlashSaleAdapter : BaseRecyclerAdapter<Any, FlashSaleAdapter.ViewHolder> {
class ViewHolder : RecyclerView.ViewHolder {
var id_ll_item: LinearLayout?
var id_img_member_bg: ImageView?
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<LinearLayout>(R.id.id_ll_item)
id_ll_item = itemView.findViewById(R.id.id_ll_item)
id_img_member_bg = itemView.findViewById(R.id.id_img_member_bg)
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)
id_tv_status = itemView.findViewById(R.id.id_tv_status)
id_tv_qianggou = itemView.findViewById(R.id.id_tv_qianggou)
goumai_progress = itemView.findViewById(R.id.goumai_progress)
}
}
}
\ No newline at end of file
moduleMain/src/main/java/com/zxbw/modulemain/adapter/HomeBannerAdapter.kt
View file @ cde0a212
......@@ -50,7 +50,7 @@ class HomeBannerAdapter : PagerAdapter {
} else if (data.bannerType.equals("H5")) {
JumpUtils.webJump("", data.url)
} else {
JumpUtils.FlashSaleJump()
}
}
container.addView(view)// 添加页卡
......
moduleMain/src/main/java/com/zxbw/modulemain/adapter/HomeQyBannerAdapter.kt
View file @ cde0a212
package com.zxbw.modulemain.adapter
import android.app.Activity
import android.text.TextUtils
import android.util.Log
import android.view.LayoutInflater
import android.view.View
......@@ -47,7 +48,12 @@ class HomeQyBannerAdapter : PagerAdapter {
var mJgqQyAdapter = JgqQyAdapter(mActivity,
OnRecycleItemClickListener<JgqQyEntity> { view, position, data ->
JumpUtils.RightsDetailJump(data.brand, data.icon)
if(TextUtils.equals(data.rechargeType,"51")){
JumpUtils.CardVoucherJump(data.brand)
}else{
JumpUtils.RightsDetailJump(data.brand, data.icon)
}
})
val manager = GridLayoutManager(mActivity, 5)
manager.isSmoothScrollbarEnabled = true;
......
moduleMain/src/main/java/com/zxbw/modulemain/contract/FlashSaleContract.kt
View file @ cde0a212
package com.zxbw.modulemain.contract
import com.zxhl.cms.net.model.qy.SkillEntity
import com.zxhl.cms.net.model.qy.SkillGoodsEntity
class FlashSaleContract {
interface View {
fun setData(result:List<SkillEntity>?)
fun setSkillListResult(result: List<SkillGoodsEntity>?)
}
interface Presenter {
fun getFlashSaleData()
fun getSkillGoodsList(durationId:String?)
}
}
\ No newline at end of file
moduleMain/src/main/java/com/zxbw/modulemain/fragment/UserCenterFragment.kt
View file @ cde0a212
......@@ -23,13 +23,14 @@ class UserCenterFragment : BaseFragment(), AdCallback<String> {
override fun init(view: View?) {
id_ll_member?.setOnClickListener {
JumpUtils.CardVoucherJump("猫眼")
//JumpUtils.CardVoucherJump("猫眼")
}
id_img_setting?.setOnClickListener {
}
id_ll_aboutus?.setOnClickListener {
JumpUtils.webJump("关于我们", NetConfig.H5.WEB_URL_ABOUT_US)
JumpUtils.AbuoutUsJump()
// JumpUtils.webJump("关于我们", NetConfig.H5.WEB_URL_ABOUT_US)
}
id_ll_login_out?.setOnClickListener {
showToast("1")
......@@ -41,10 +42,10 @@ class UserCenterFragment : BaseFragment(), AdCallback<String> {
JumpUtils.webJump("用户协议", NetConfig.H5.WEB_URL_USER)
}
id_ll_my_warehouse?.setOnClickListener {
JumpUtils.FlashSaleJump()
}
id_ll_shangwu_hezuo?.setOnClickListener {
JumpUtils.WithdrawalJump()
//JumpUtils.WithdrawalJump()
}
}
......
moduleMain/src/main/java/com/zxbw/modulemain/presenter/FlashSalePresenter.kt
View file @ cde0a212
......@@ -5,6 +5,7 @@ import com.zxhl.cms.net.ApiClient
import com.zxhl.cms.net.RxSchedulers
import com.zxhl.cms.net.callback.BaseObserver
import com.zxhl.cms.net.model.qy.SkillEntity
import com.zxhl.cms.net.model.qy.SkillGoodsEntity
class FlashSalePresenter : FlashSaleContract.Presenter {
private val mView: FlashSaleContract.View
......@@ -25,4 +26,17 @@ class FlashSalePresenter : FlashSaleContract.Presenter {
}
})
}
override fun getSkillGoodsList(string: String?) {
ApiClient.homeApi.getskillGoodsList(string).compose(RxSchedulers.observableIO2Main())
.subscribe(object : BaseObserver<List<SkillGoodsEntity>>() {
override fun onSuccess(result: List<SkillGoodsEntity>?) {
mView.setSkillListResult(result)
}
override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
}
})
}
}
\ No newline at end of file
moduleMain/src/main/res/drawable/shape_buy_bg.xml 0 → 100644
View file @ cde0a212
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:angle="90"
android:endColor="#fffbc280"
android:startColor="#fffcdca8"
android:type="linear"
android:useLevel="true" />
<corners
android:bottomLeftRadius="0dp"
android:bottomRightRadius="22dp"
android:topLeftRadius="0dp"
android:topRightRadius="22dp" />
</shape>
\ No newline at end of file
moduleMain/src/main/res/drawable/shape_f3f4f5_r20.xml 0 → 100644
View file @ cde0a212
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:angle="180"
android:endColor="#ff4d4e4f"
android:startColor="#ff2a2a28"
android:type="linear"
android:useLevel="true" />
<corners
android:bottomLeftRadius="22dp"
android:bottomRightRadius="0dp"
android:topLeftRadius="22dp"
android:topRightRadius="0dp" />
</shape>
\ No newline at end of file
moduleMain/src/main/res/drawable/shape_process_skill_bug.xml 0 → 100644
View file @ cde0a212
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@android:id/background">
<shape>
<corners android:radius="5dp" />
<solid android:color="#ffff959d" />
</shape>
</item>
<item android:id="@android:id/progress">
<clip>
<shape>
<corners android:radius="5dp" />
<gradient
android:angle="0"
android:endColor="#ffff4e17"
android:startColor="#fff20200" />
</shape>
</clip>
</item>
</layer-list>
\ No newline at end of file
moduleMain/src/main/res/layout/activity_layout_abuout_us.xml 0 → 100644
View file @ cde0a212
<?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:background="@color/white"
android:orientation="vertical">
<RelativeLayout
android:id="@+id/id_rl_title"
android:layout_width="match_parent"
android:layout_height="80dp"
android:background="@color/white">
<ImageView
android:id="@+id/id_img_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:padding="16dp"
android:src="@drawable/icon_fanhui" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="15dp"
android:text="关于我们"
android:textColor="@color/color_333333"
android:textSize="16sp"
android:textStyle="bold" />
</RelativeLayout>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="50dp"
android:layout_marginBottom="20dp"
android:src="@drawable/logo_xiaoxiangshengqian" />
<TextView
android:id="@+id/id_tv_version"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" />
</LinearLayout>
moduleMain/src/main/res/layout/activity_layout_buy_vip.xml
View file @ cde0a212
......@@ -7,7 +7,7 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="30dp">
android:layout_marginTop="40dp">
<ImageView
android:id="@+id/id_img_close"
......
moduleMain/src/main/res/layout/activity_layout_card_voucher.xml
View file @ cde0a212
......@@ -7,7 +7,7 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="68dp"
android:layout_height="80dp"
android:background="@color/white">
<ImageView
......@@ -26,7 +26,7 @@
android:layout_marginBottom="15dp"
android:text="卡券列表"
android:textColor="@color/color_333333"
android:textSize="16sp"
android:textSize="18sp"
android:textStyle="bold" />
</RelativeLayout>
......
moduleMain/src/main/res/layout/activity_layout_cofig_buy_vip.xml
View file @ cde0a212
......@@ -22,7 +22,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="16dp"
android:layout_marginTop="20dp"
android:layout_marginTop="30dp"
android:src="@drawable/icon_fanhui_white" />
<TextView
......@@ -31,7 +31,7 @@
android:layout_centerHorizontal="true"
android:text="确认支付"
android:textColor="@color/white"
android:layout_marginTop="36dp"
android:layout_marginTop="46dp"
android:textSize="16sp"
android:textStyle="bold" />
......@@ -40,7 +40,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/id_rl_top"
android:layout_marginTop="-60dp"
android:layout_marginTop="-50dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:background="@drawable/huiyuankapian">
......
moduleMain/src/main/res/layout/activity_layout_flash_sale.xml
View file @ cde0a212
......@@ -6,7 +6,7 @@
android:background="#DA2333">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="68dp"
android:layout_height="80dp"
android:background="@color/white">
<ImageView
......
moduleMain/src/main/res/layout/activity_layout_skill_pay.xml
View file @ cde0a212
......@@ -7,7 +7,7 @@
<RelativeLayout
android:id="@+id/id_rl_title"
android:layout_width="match_parent"
android:layout_height="68dp"
android:layout_height="80dp"
android:background="@color/white">
<ImageView
......@@ -19,6 +19,7 @@
android:src="@drawable/icon_fanhui" />
<TextView
android:id="@+id/id_title_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
......@@ -55,6 +56,7 @@
android:orientation="vertical">
<TextView
android:id="@+id/id_tv_goods_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="喜马拉雅vip会员"
......@@ -63,6 +65,7 @@
android:textStyle="bold" />
<TextView
android:id="@+id/id_tv_member_discount"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
......@@ -87,6 +90,7 @@
android:textStyle="bold" />
<TextView
android:id="@+id/id_tv_sale_price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
......@@ -103,6 +107,7 @@
android:textSize="12sp" />
<TextView
android:id="@+id/id_tv_orgin_price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=" ¥ 30"
......@@ -190,6 +195,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/id_ll_no_vip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
......
moduleMain/src/main/res/layout/activity_layout_withdrawal.xml
View file @ cde0a212
......@@ -7,7 +7,7 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="68dp"
android:layout_height="80dp"
android:background="@color/white">
<ImageView
......
moduleMain/src/main/res/layout/fragment_layout_user_center.xml
View file @ cde0a212
......@@ -21,7 +21,7 @@
android:id="@+id/id_rl_center_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp">
android:layout_marginTop="30dp">
<ImageView
android:layout_width="wrap_content"
......@@ -95,6 +95,11 @@
android:text="普通用户"
android:textColor="@color/white"
android:textSize="10sp" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/mark_vip"
android:visibility="gone"/>
</LinearLayout>
<TextView
......@@ -364,9 +369,8 @@
android:layout_marginBottom="16dp"
android:layout_marginTop="16dp"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/id_ll_aboutus"
android:id="@+id/id_ll_shangwu_hezuo"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
......@@ -377,17 +381,18 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="6dp"
android:src="@drawable/icon_guanyuwomen" />
android:src="@drawable/icon_shangwuhezuo" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="关于我们"
android:text="我的订单"
android:textColor="@color/color_333333"
android:textSize="12sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/id_ll_login_out"
android:layout_width="0dp"
......@@ -485,7 +490,7 @@
<LinearLayout
android:id="@+id/id_ll_shangwu_hezuo"
android:id="@+id/id_ll_aboutus"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
......@@ -496,12 +501,12 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="6dp"
android:src="@drawable/icon_shangwuhezuo" />
android:src="@drawable/icon_guanyuwomen" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="商务合作"
android:text="关于我们"
android:textColor="@color/color_333333"
android:textSize="12sp" />
</LinearLayout>
......
moduleMain/src/main/res/layout/item_layout_card.xml
View file @ cde0a212
......@@ -90,7 +90,7 @@
android:text="猫眼电影5元代金券"
android:textColor="@color/color_333333"
android:includeFontPadding="false"
android:textSize="14sp" />
android:textSize="16sp" />
<TextView
android:id="@+id/id_tv_card_discount"
......@@ -106,7 +106,7 @@
android:includeFontPadding="false"
android:text="会员专享7.6折"
android:textColor="#A85C00"
android:textSize="10sp" />
android:textSize="12sp" />
<LinearLayout
android:layout_width="match_parent"
......
moduleMain/src/main/res/layout/item_layout_sale_flash_top.xml
View file @ cde0a212
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/id_ll_item"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="2dp"
......@@ -52,6 +53,7 @@
android:textSize="12sp" />
<TextView
android:id="@+id/id_tv_sale_price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="2dp"
......@@ -62,6 +64,7 @@
android:textStyle="bold" />
<TextView
android:id="@+id/id_tv_yuanjia"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="¥20"
......@@ -75,17 +78,26 @@
android:layout_below="@+id/id_ll_middle">
<TextView
android:id="@+id/id_tv_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:text="未开始"
android:textColor="@color/color_999999"
android:textSize="12sp" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<ProgressBar
android:id="@+id/goumai_progress"
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_marginTop="8dp"
android:progressDrawable="@drawable/shape_process_skill_bug" />
<TextView
android:id="@+id/id_tv_qianggou"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
......
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