Skip to content

M
magicbox
Commit 581ac570 authored by 王雪伟's avatar 王雪伟
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 363bdc07 76f790c3
Hide whitespace changes
Inline Side-by-side
Showing with 119 additions and 93 deletions
cms/src/main/java/com/zxhl/cms/utils/WeChatUtils.kt
View file @ 581ac570
......@@ -53,7 +53,7 @@ class WeChatUtils {
}
})
return isLogin
return true
}
......
cms/src/main/res/values/strings.xml
View file @ 581ac570
......@@ -28,6 +28,7 @@
//首页
<string name="open_nums">opened %1$s times</string>
<string name="get_value">100% get value</string>
<string name="reduce">-</string>
//仓库
<string name="time_limit">Limited time offer</string>
<string name="immediate_recycling">Reclaim</string>
......@@ -41,9 +42,17 @@
<string name="recycle_desc">Reclaim the good you selected for</string>
<string name="recycle_desc2">You can exchange high-value goods</string>
<!--订单-->
<string name="shop_order">商城订单</string>
<string name="shop_order">Mall order</string>
<string name="my_order">My order</string>
<string name="magic_box_order">魔盒订单</string>
<string name="magic_box_order">Boxes order</string>
<string name="goods_list">%1$s items in total</string>
<string name="note">Note</string>
<string name="input_your_needs">Please input your needs.</string>
<string name="order_detail">Order details</string>
<string name="total_price">Total:</string>
<string name="pay">Pay</string>
<string name="order_pay">订单支付</string>
<string name="write_info">Please input your delivery address</string>
<!--下单成功-->
<string name="order_suceess_title">Deliver</string>
<string name="delivery_request_succes">Delivery request successful</string>
......@@ -69,10 +78,11 @@
<string name="paid">Paid: </string>
<string name="express_fee">Express fee</string>
<string name="copy">copy</string>
<string name="fun_copy">Copied</string>
<!--魔盒商品详情-->
<string name="box_detail_open_box_money_unit">$</string>
<string name="box_detail_open_box_num">opened %1$s times</string>
<string name="box_detail_open_box_num">opened:%1$s</string>
<string name="box_detail_open_box_tips">FAIRNESS GUARANTEED</string>
<string name="box_detail_open_box_rule">Rule</string>
<string name="box_detail_open_box_test_play">TRY FOR FREE</string>
......
moduleMain/src/main/java/com/zxhl/main/page/activity/NewBoxGoodsDetailActivity.kt
View file @ 581ac570
......@@ -336,16 +336,16 @@ class NewBoxGoodsDetailActivity : BaseActivity(), GoodsDetailContract.View,
}
allList?.clear()
if (result?.list?.l0 != null) {
allList?.addAll(result?.list?.l0!!)
allList?.addAll(result?.list?.l3!!)
}
if (result?.list?.l1 != null) {
allList?.addAll(result?.list?.l1!!)
allList?.addAll(result?.list?.l2!!)
}
if (result?.list?.l2 != null) {
allList?.addAll(result?.list?.l2!!)
allList?.addAll(result?.list?.l1!!)
}
if (result?.list?.l3 != null) {
allList?.addAll(result?.list?.l3!!)
allList?.addAll(result?.list?.l0!!)
}
mPoolAdapter?.clear()
mPoolAdapter?.appendToList(allList)
......
moduleMain/src/main/java/com/zxhl/main/page/activity/OrderDetailActivity.kt
View file @ 581ac570
......@@ -176,22 +176,22 @@ class OrderDetailActivity : BaseActivity(), OrderDetailContract.View, PayContrac
}
id_tv_goods_num?.text = "商品列表(共${result?.size}件商品)"
id_tv_goods_num?.text = mActivity?.getString(R.string.goods_list,"${result?.size}")
if (result?.packingFee!! > 0 && result?.size.equals("1")) {
id_rl_dabaofei.visibility = View.VISIBLE
id_tv_yunfei_price_trip.text = "打包费"
id_tv_price_trip.text = "运费"
id_tv_yunfei?.text = "0元"
id_tv_dabaofei?.text = "${result?.packingFee}元"
id_tv_pay_price?.text = "${result?.packingFee}元"
id_tv_price_trip.text = mActivity?.getString(R.string.express_fee)
id_tv_yunfei?.text = "$0"
id_tv_dabaofei?.text = "$${result?.packingFee}"
id_tv_pay_price?.text = "${result?.packingFee}"
mPayPrice = result?.packingFee.toString()
payGoodsId = result?.payPackingFeeId ?: ""
} else {
id_rl_dabaofei.visibility = View.GONE
id_tv_price_trip.text = "运费"
id_tv_yunfei?.text = "${result?.freight}元"
id_tv_pay_price?.text = "${result?.freight}元"
id_tv_price_trip.text = mActivity?.getString(R.string.express_fee)
id_tv_yunfei?.text = "$${result?.freight}"
id_tv_pay_price?.text = "${result?.freight}"
mPayPrice = result?.freight
payGoodsId = result?.payGoodsId ?: ""
}
......
moduleMain/src/main/java/com/zxhl/main/page/activity/ShopOrderActivity.kt
View file @ 581ac570
......@@ -26,8 +26,11 @@ import com.zxhl.novel.utils.server.PayResultEntity
import io.reactivex.Observable
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.functions.Consumer
import kotlinx.android.synthetic.main.activity_layout_shop_order.*
//商城订单支付页面
class ShopOrderActivity : BaseActivity(), ShopOrderContract.View, PayContract.View {
private var mPresenter: ShopOrderPresenter? = null
private var mAdapter: OrderAdapter? = null
......@@ -179,15 +182,15 @@ class ShopOrderActivity : BaseActivity(), ShopOrderContract.View, PayContract.Vi
payGoodsId2 = result?.payGoodsId2.toString()
mPayPrice = totalPrice
payId = payGoodsId
if(TextUtils.equals(discount,"0")){
id_rl_use_youhui.visibility=View.GONE
if (TextUtils.equals(discount, "0")) {
id_rl_use_youhui.visibility = View.GONE
noUseDiscount()
}else{
id_rl_use_youhui.visibility=View.VISIBLE
} else {
id_rl_use_youhui.visibility = View.VISIBLE
useDisCount()
}
id_tv_magic_coin_desc.text="${discount}魔币可抵${discount}元"
id_tv_yunfei?.text = "${result?.freight}元"
id_tv_magic_coin_desc.text = "Coin ${discount} gives ${discount}$ discount"
id_tv_yunfei?.text = "${result?.freight}"
// if (TextUtils.equals(result?.freight, "0")) {
// id_rl_yunfei.visibility = View.GONE
// } else {
......@@ -195,7 +198,8 @@ class ShopOrderActivity : BaseActivity(), ShopOrderContract.View, PayContract.Vi
//
// }
id_tv_time_trip?.text = result?.text
id_tv_goods_num?.text = "商品列表(共${result?.goodsList?.size}件商品)"
id_tv_goods_num?.text =
mActivity?.getString(R.string.goods_list, "${result?.goodsList?.size.toString()}")
// if (result?.packingFee!! > 0 && result?.size.equals("1")) {
// id_rl_dabaofei.visibility = View.VISIBLE
// id_tv_yunfei_price_trip.text = "打包费"
......@@ -398,7 +402,7 @@ class ShopOrderActivity : BaseActivity(), ShopOrderContract.View, PayContract.Vi
//不使用优惠
fun noUseDiscount() {
ifUseDiscount = false
id_tv_youhui.text = "-$ ${discount}"
id_tv_youhui.text = "-$ ${discount}"
id_img_chosse_youhui.setImageResource(R.drawable.icon_xuanzhong_default)
id_tv_pay_money.text = totalPrice2
payId = payGoodsId2
......
moduleMain/src/main/java/com/zxhl/main/page/adapter/BoxAdapter.kt
View file @ 581ac570
......@@ -77,7 +77,7 @@ class BoxAdapter : BaseRecyclerAdapter<HomeBoxListEntity, RecyclerView.ViewHolde
holder.id_tv_new_people_price?.visibility = View.VISIBLE
holder.id_tv_new_people_price?.text = "$${bean.newUserPrice}"
holder.id_tv_new_people_price?.getPaint()?.setFlags(Paint.STRIKE_THRU_TEXT_FLAG)
holder.id_new_user_box_tips?.text = "New user$ ${bean.discount} discount"
holder.id_new_user_box_tips?.text = "New user $${bean.discount} discount"
}
holder.item_img_goos?.setLoadImageUrl(bean.mainImage, false)
// holder.item_img_1?.setLoadImageUrl(bean.imageList2?.get(0), false)
......
moduleMain/src/main/java/com/zxhl/main/page/adapter/BoxOrderAdapter.kt
View file @ 581ac570
......@@ -92,6 +92,6 @@ class BoxOrderAdapter : BaseRecyclerAdapter<ShopOrderEntity, BoxOrderAdapter.Vie
ClipData.newPlainText("Label", string)
// 将ClipData内容放到系统剪贴板里。
cm.setPrimaryClip(mClipData)
Utils.showToast(mContext, "已复制到剪切板")
Utils.showToast(mContext, AppContext.get().getString(R.string.fun_copy))
}
}
\ No newline at end of file
moduleMain/src/main/java/com/zxhl/main/page/adapter/ItemOrderAdapter.kt
View file @ 581ac570
......@@ -98,6 +98,6 @@ class ItemOrderAdapter : BaseRecyclerAdapter<GoodList, ItemOrderAdapter.ViewHold
ClipData.newPlainText("Label", string)
// 将ClipData内容放到系统剪贴板里。
cm.setPrimaryClip(mClipData)
Utils.showToast(mContext, "已复制到剪切板")
Utils.showToast(mContext, AppContext.get().getString(R.string.fun_copy))
}
}
\ No newline at end of file
moduleMain/src/main/java/com/zxhl/main/page/adapter/ReceiveAdapter.kt
View file @ 581ac570
......@@ -96,7 +96,7 @@ class ReceiveAdapter : BaseRecyclerAdapter<DepotEntity, RecyclerView.ViewHolder>
ClipData.newPlainText("Label", string)
// 将ClipData内容放到系统剪贴板里。
cm.setPrimaryClip(mClipData)
Utils.showToast(mContext, "已复制到剪切板")
Utils.showToast(mContext, AppContext.get().getString(R.string.fun_copy))
}
private var isLoadMore = true
fun setLoadMore(isBoolean: Boolean) {
......
moduleMain/src/main/res/layout/activity_layout_order_detail.xml
View file @ 581ac570
......@@ -24,7 +24,7 @@
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:includeFontPadding="false"
android:text="订单详情"
android:text="@string/order_detail"
android:textColor="@color/color_333333"
android:textStyle="bold" />
......@@ -37,7 +37,6 @@
android:layout_marginRight="15dp"
android:drawableLeft="@drawable/icon_kefu_hei"
android:drawablePadding="5dp"
android:text="客服"
android:textColor="@color/color_333333"
android:textSize="14sp" />
</RelativeLayout>
......@@ -150,7 +149,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:text="商品列表(共0件商品)"
android:text="@string/goods_list"
android:textColor="@color/color_333333"
android:textSize="15sp" />
......@@ -175,7 +174,7 @@
android:id="@+id/id_tv_price_trip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="运费"
android:text="@string/express_fee"
android:textColor="@color/color_666666"
android:textSize="14sp" />
......@@ -282,7 +281,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="备注留言"
android:text="@string/note"
android:textColor="@color/color_333333"
android:textSize="15sp" />
......@@ -292,7 +291,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:background="@null"
android:hint="你有什么特别需要请告诉我们"
android:hint="@string/input_your_needs"
android:textColor="@color/color_333333"
android:textColorHint="#999999"
android:textSize="13sp" />
......@@ -314,7 +313,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="应付金额:"
android:text="@string/total_price"
android:textColor="@color/color_666666"
android:textSize="13sp" />
......@@ -349,7 +348,7 @@
android:layout_centerVertical="true"
android:background="@drawable/shape_ff2e31_r25"
android:gravity="center"
android:text="去支付"
android:text="@string/pay"
android:textColor="@color/white"
android:textSize="18sp"
android:textStyle="bold" />
......
moduleMain/src/main/res/layout/activity_layout_shop_goods_detail.xml
View file @ 581ac570
......@@ -23,7 +23,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="Good detail"
android:text="Product detail"
android:textColor="@color/color_333333"
android:textSize="18sp"
android:textStyle="bold" />
......@@ -123,7 +123,7 @@
android:layout_gravity="center_horizontal"
android:layout_marginTop="10dp"
android:layout_marginBottom="20dp"
android:text="good detail"
android:text="Product detail"
android:textColor="@color/color_333333"
android:textSize="14sp"
android:textStyle="bold" />
......
moduleMain/src/main/res/layout/activity_layout_shop_order.xml
View file @ 581ac570
......@@ -25,7 +25,7 @@
android:layout_centerHorizontal="true"
android:layout_marginBottom="12dp"
android:includeFontPadding="false"
android:text="订单支付"
android:text="@string/order_pay"
android:textColor="@color/color_333333"
android:textSize="18sp" />
</RelativeLayout>
......@@ -58,7 +58,7 @@
android:layout_marginLeft="15dp"
android:drawableLeft="@drawable/icon_add"
android:drawablePadding="5dp"
android:text="请填写收货人信息"
android:text="@string/write_info"
android:textColor="@color/color_333333"
android:textSize="15sp" />
......@@ -139,7 +139,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:text="商品列表(共0件商品)"
android:text="@string/goods_list"
android:textColor="@color/color_333333"
android:textSize="15sp" />
......@@ -173,7 +173,7 @@
android:id="@+id/id_tv_price_trip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="运费"
android:text="@string/express_fee"
android:textColor="@color/color_666666"
android:textSize="14sp" />
......@@ -219,7 +219,7 @@
android:id="@+id/id_tv_text_youhui"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="优惠"
android:text="@string/discount"
android:textColor="@color/color_666666"
android:textSize="14sp" />
......@@ -228,7 +228,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toRightOf="@+id/id_tv_text_youhui"
android:text="优惠"
android:layout_marginLeft="5dp"
android:textColor="@color/color_666666"
android:textSize="14sp" />
......@@ -262,7 +261,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="合计："
android:text="@string/total"
android:textColor="@color/color_333333"
android:textSize="14sp" />
......@@ -360,7 +359,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="备注留言"
android:text="@string/note"
android:textColor="@color/color_333333"
android:textSize="15sp" />
......@@ -370,7 +369,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:background="@null"
android:hint="你有什么特别需要请告诉我们"
android:hint="@string/input_your_needs"
android:textColor="@color/color_333333"
android:textColorHint="#999999"
android:textSize="13sp" />
......@@ -388,7 +387,7 @@
android:layout_margin="15dp"
android:background="@drawable/shape_ff2e31_r25"
android:gravity="center"
android:text="去支付"
android:text="@string/pay"
android:textColor="@color/white"
android:textSize="18sp"
android:textStyle="bold" />
......
moduleMain/src/main/res/layout/activity_splash.xml
View file @ 581ac570
......@@ -56,7 +56,7 @@
android:layout_centerHorizontal="true"
android:layout_marginBottom="16dp"
android:includeFontPadding="false"
android:text="幸运魔盒"
android:text="@string/app_name"
android:textColor="@color/color_333333"
android:textSize="18sp" />
</RelativeLayout>
......
moduleMain/src/main/res/layout/fragment_layout_magic_box_order.xml
View file @ 581ac570
......@@ -36,7 +36,8 @@
android:id="@+id/box_order_recyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="5dp" />
android:paddingLeft="5dp"
android:paddingRight="5dp"/>
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
......
moduleMain/src/main/res/layout/fragment_layout_other.xml
View file @ 581ac570
......@@ -56,13 +56,12 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="2000dp">
android:layout_height="wrap_content">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp" />
android:layout_height="wrap_content" />
<TextView
android:id="@+id/id_tv_dixian"
......
moduleMain/src/main/res/layout/fragment_recycled_layout.xml
View file @ 581ac570
......@@ -47,13 +47,13 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp" />
android:layout_height="wrap_content" />
<TextView
android:id="@+id/id_tv_dixian"
......
moduleMain/src/main/res/layout/fragment_shop_order.xml
View file @ 581ac570
......@@ -12,7 +12,8 @@
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="5dp" />
android:paddingLeft="5dp"
android:paddingRight="5dp" />
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
......@@ -21,11 +22,11 @@
android:id="@+id/id_order_empty"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:visibility="gone"
android:layout_gravity="center_horizontal"
android:layout_marginTop="160dp"
android:orientation="vertical">
android:gravity="center"
android:orientation="vertical"
android:visibility="gone">
<ImageView
android:layout_width="wrap_content"
......
moduleMain/src/main/res/layout/fragment_warehouse_layout.xml
View file @ 581ac570
......@@ -125,7 +125,7 @@
android:layout_width="80dp"
android:layout_height="32dp"
android:layout_marginLeft="15dp"
android:background="@drawable/shape_fahuo_bg"
android:background="@drawable/button_recycle_center"
android:gravity="center"
android:text="@string/take_delivery"
android:textColor="@color/white"
......
moduleMain/src/main/res/layout/item_layout_new_box.xml
View file @ 581ac570
......@@ -75,7 +75,7 @@
android:layout_centerVertical="true"
android:background="@drawable/shape_ff2e31_r5_stroke"
android:includeFontPadding="false"
android:paddingLeft="28dp"
android:paddingLeft="2dp"
android:paddingTop="2dp"
android:paddingRight="5dp"
android:paddingBottom="2dp"
......@@ -94,9 +94,10 @@
android:paddingTop="2dp"
android:paddingRight="5dp"
android:paddingBottom="2dp"
android:text="减"
android:text="@string/reduce"
android:textColor="@color/white"
android:textSize="13sp" />
android:textSize="13sp"
android:visibility="gone"/>
</RelativeLayout>
<LinearLayout
......
moduleMain/src/main/res/layout/item_layout_pick_up.xml
View file @ 581ac570
......@@ -5,7 +5,7 @@
android:layout_height="90dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginBottom="10dp"
android:layout_marginTop="10dp"
android:background="@drawable/shape_ffffff_r5">
<CheckBox
......
moduleMain/src/main/res/layout/item_layout_recover.xml
View file @ 581ac570
......@@ -5,7 +5,7 @@
android:layout_height="85dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginBottom="10dp"
android:layout_marginTop="10dp"
android:background="@drawable/shape_ffffff_r5">
......
moduleMain/src/main/res/layout/item_layout_shop_order.xml
View file @ 581ac570
......@@ -2,7 +2,9 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:layout_marginTop="10dp"
android:background="@drawable/shape_ffffff_r5"
android:orientation="vertical">
......@@ -37,6 +39,7 @@
android:background="@drawable/shape_ffffff_r10_stoke_999999"
android:gravity="center"
android:paddingLeft="5dp"
android:includeFontPadding="false"
android:paddingTop="2dp"
android:paddingRight="5dp"
android:paddingBottom="2dp"
......@@ -192,6 +195,7 @@
android:paddingBottom="2dp"
android:text="@string/copy"
android:textColor="@color/color_999999"
android:includeFontPadding="false"
android:textSize="12sp" />
</LinearLayout>
......
moduleMain/src/main/res/layout/items_layout_box_order.xml
View file @ 581ac570
......@@ -2,7 +2,9 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:layout_marginLeft="5dp"
android:layout_marginTop="10dp"
android:layout_marginRight="5dp"
android:background="@drawable/shape_ffffff_r5"
android:orientation="vertical">
......@@ -68,10 +70,10 @@
android:id="@+id/id_tv_order_no"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:lines="1"
android:ellipsize="end"
android:layout_weight="1"
android:ellipsize="end"
android:gravity="right"
android:lines="1"
android:textColor="@color/color_999999"
android:textSize="12sp" />
......@@ -82,13 +84,14 @@
android:layout_marginLeft="5dp"
android:background="@drawable/shape_ffffff_r10_stoke_999999"
android:gravity="center"
android:includeFontPadding="false"
android:paddingLeft="5dp"
android:paddingTop="2dp"
android:paddingRight="5dp"
android:paddingBottom="2dp"
android:text="@string/copy"
android:textColor="@color/color_999999"
android:textSize="12sp"/>
android:textSize="12sp" />
</LinearLayout>
<LinearLayout
......@@ -109,9 +112,9 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:ellipsize="end"
android:gravity="right"
android:lines="1"
android:ellipsize="end"
android:textColor="@color/color_999999"
android:textSize="12sp" />
</LinearLayout>
......
moduleMain/src/main/res/layout/items_order_layout.xml
View file @ 581ac570
......@@ -38,6 +38,7 @@
android:paddingTop="2dp"
android:paddingRight="5dp"
android:paddingBottom="2dp"
android:includeFontPadding="false"
android:text="@string/copy"
android:textColor="@color/color_999999"
android:textSize="12sp" />
......
moduleUc/src/main/java/com/zxhl/uc/page/fragment/UserCenterFragment.kt
View file @ 581ac570
......@@ -84,7 +84,7 @@ class UserCenterFragment : BaseFragment(), AdCallback<String> {
override fun data() {
super.data()
userVisibleHint = true
getRecomendList()
}
......@@ -108,7 +108,6 @@ class UserCenterFragment : BaseFragment(), AdCallback<String> {
override fun lazyLoad() {
super.lazyLoad()
if (isInitial && isVisible) {
getRecomendList()
getAppInfo()
UserDataUtils.updateUserInfo(this)
// getAds()
......
moduleUc/src/main/res/layout/fragment_user_center.xml
View file @ 581ac570
......@@ -2,15 +2,17 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:src="@drawable/bj_wode" />
<RelativeLayout
android:id="@+id/id_rl_user"
android:layout_width="match_parent"
android:layout_height="150dp"
android:layout_height="140dp"
android:layout_marginLeft="10dp"
android:layout_marginTop="80dp"
android:layout_marginRight="10dp"
......@@ -65,8 +67,8 @@
android:layout_height="wrap_content"
android:layout_marginBottom="5dp"
android:text="Lucky coin"
android:textColor="@color/color_666666"
android:textSize="14sp" />
android:textColor="@color/color_333333"
android:textSize="15sp" />
<TextView
android:id="@+id/id_tv_lucky_coin_ava"
......@@ -74,9 +76,10 @@
android:layout_height="wrap_content"
android:drawableLeft="@drawable/icon_jinbi"
android:drawablePadding="6dp"
android:includeFontPadding="false"
android:text="0"
android:textColor="@color/color_333333"
android:textSize="15sp" />
android:textSize="18sp" />
</LinearLayout>
<LinearLayout
......@@ -94,8 +97,8 @@
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:text="Magic coin"
android:textColor="@color/color_666666"
android:textSize="14sp" />
android:textColor="@color/color_333333"
android:textSize="15sp" />
<TextView
android:id="@+id/id_tv_magic_num"
......@@ -103,11 +106,13 @@
android:layout_height="wrap_content"
android:drawableLeft="@drawable/icon_mobi"
android:drawablePadding="6dp"
android:includeFontPadding="false"
android:text="0"
android:textColor="@color/color_333333"
android:textSize="15sp" />
android:textSize="18sp" />
</LinearLayout>
</RelativeLayout>
<RelativeLayout
android:id="@+id/id_fragment_user_ad_layout"
android:layout_width="match_parent"
......
moduleUc/src/main/res/layout/layout_recommend.xml
View file @ 581ac570
......@@ -28,11 +28,11 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawableTop="@drawable/icon_dingdan"
android:drawablePadding="10dp"
android:drawablePadding="5dp"
android:gravity="center"
android:text="@string/my_order"
android:textColor="@color/color_333333"
android:textSize="15sp" />
android:textColor="@color/color_666666"
android:textSize="14sp" />
<TextView
android:id="@+id/id_rl_address"
......@@ -40,22 +40,22 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawableTop="@drawable/icon_shouhuo"
android:drawablePadding="10dp"
android:drawablePadding="5dp"
android:gravity="center"
android:text="@string/delivery_address"
android:textColor="@color/color_333333"
android:textSize="15sp" />
android:textColor="@color/color_666666"
android:textSize="14sp" />
<TextView
android:id="@+id/id_rl_jiyijan"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawableTop="@drawable/icon_kefu"
android:drawablePadding="10dp"
android:drawablePadding="5dp"
android:gravity="center"
android:text="@string/customerservice"
android:textColor="@color/color_333333"
android:textSize="15sp" />
android:textColor="@color/color_666666"
android:textSize="14sp" />
<TextView
......@@ -64,11 +64,11 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawableTop="@drawable/icon_guanyu"
android:drawablePadding="10dp"
android:drawablePadding="5dp"
android:gravity="center"
android:text="@string/about_us"
android:textColor="@color/color_333333"
android:textSize="15sp" />
android:textColor="@color/color_666666"
android:textSize="14sp" />
......
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