Skip to content

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

Merge remote-tracking branch 'origin/master'

parents 7240f639 7cdebcd0
Hide whitespace changes
Inline Side-by-side
Showing with 171 additions and 128 deletions
app/build.gradle
View file @ ec8ac22f
......@@ -63,37 +63,37 @@ android {
}
}
MobSDK {
appKey "357874b62b4c7"
appSecret "c4d82ff12e0cde832960ddbb8d2d7250"
gui false
version '3.9.7'
ShareSDK {
loopShare true
devInfo {
Facebook {
id 8
sortId 8
appKey "662970168312513"
callbackUri "https://www.baidu.com"
officialVersion "default"
faceBookLoginProtocolScheme "fb662970168312513"
shareByAppClient true
enable true
}
GooglePlus {
id 21
sortId 21
appId "236300675100-am5pm8km7md1memjevq8rl9pg5c4s4b8.apps.googleusercontent.com"
callbackUri "http://localhost"
officialVersion "default"
shareByAppClient true
enable true
}
}
}
}
// MobSDK {
// appKey "357874b62b4c7"
// appSecret "c4d82ff12e0cde832960ddbb8d2d7250"
// gui false
// version '3.9.7'
// ShareSDK {
// loopShare true
// devInfo {
// Facebook {
// id 8
// sortId 8
// appKey "662970168312513"
// callbackUri "https://www.baidu.com"
// officialVersion "default"
// faceBookLoginProtocolScheme "fb662970168312513"
// shareByAppClient true
// enable true
// }
// GooglePlus {
// id 21
// sortId 21
// appId "236300675100-am5pm8km7md1memjevq8rl9pg5c4s4b8.apps.googleusercontent.com"
// callbackUri "http://localhost"
// officialVersion "default"
// shareByAppClient true
// enable true
// }
//
// }
// }
// }
productFlavors {
guanwang {}
......
app/src/main/java/com/zhangxin/magicbox/Appli.kt
View file @ ec8ac22f
......@@ -39,7 +39,6 @@ class Appli : Application() {
Config.init(this)
getOaid()
initByteDance()
MobSDK.init(this)
MobSDK.submitPolicyGrantResult(true, null)
MobSDK.init(this)
initPayPal()
......
cms/src/main/java/com/zxhl/cms/utils/WeChatUtils.kt
View file @ ec8ac22f
......@@ -214,7 +214,7 @@ class WeChatUtils {
}
fun GoogleLogin() {
MobSDK.submitPolicyGrantResult(true, null)
// MobSDK.submitPolicyGrantResult(true, null)
val plat = ShareSDK.getPlatform(GooglePlus.NAME)
ShareSDK.setActivity(mContext as Activity)
//授权回调监听，监听oncomplete，onerror，oncancel三种状态
......
cms/src/main/res/values/colors.xml
View file @ ec8ac22f
......@@ -25,7 +25,7 @@
<color name="color_999999">#999999</color>
<color name="color_1d1d1f">#1D1D1F</color>
<color name="color_3A95FD">#3A95FD</color>
<color name="color_ff2e31">#FF2E31</color>
<color name="color_ff2e31">#4C84FF</color>
<color name="color_000000">#000000</color>
<color name="color_99ffffff">#99ffffff</color>
<color name="color_ededed">#EDEDED</color>
......
cms/src/main/res/values/strings.xml
View file @ ec8ac22f
......@@ -68,7 +68,7 @@
<string name="unshipped">Unshipped </string>
<string name="paid">Paid: </string>
<string name="express_fee">Express fee</string>
<string name="copy">Copy</string>
<string name="copy">copy</string>
<!--魔盒商品详情-->
<string name="box_detail_open_box_money_unit">$</string>
......
moduleMain/src/main/java/com/zxhl/main/page/activity/GoodsDetailActivity.kt
View file @ ec8ac22f
......@@ -505,7 +505,7 @@ class GoodsDetailActivity : BaseActivity(), GoodsDetailContract.View,
//暴击卡
if (!result.criticalHit.isNullOrEmpty()) {
id_card_baoji_num.text = " x${result.criticalHit?.size} "
id_card_baoji_num.setTextColor(Color.parseColor("#FF2E31"))
id_card_baoji_num.setTextColor(Color.parseColor("#4C84FF"))
id_card_baoji_num.textSize = 12f
id_card_baoji_suo.visibility = View.GONE
} else {
......@@ -517,7 +517,7 @@ class GoodsDetailActivity : BaseActivity(), GoodsDetailContract.View,
//重抽卡
if (!result.rePumping.isNullOrEmpty()) {
id_card_chongchou_num.text = " x${result.rePumping?.size} "
id_card_chongchou_num.setTextColor(Color.parseColor("#FF2E31"))
id_card_chongchou_num.setTextColor(Color.parseColor("#4C84FF"))
id_card_chongchou_num.textSize = 12f
id_card_chongchou_suo.visibility = View.GONE
......@@ -531,7 +531,7 @@ class GoodsDetailActivity : BaseActivity(), GoodsDetailContract.View,
//回血卡
if (!result.bloodReturn.isNullOrEmpty()) {
id_card_huixue_num.text = " x${result.bloodReturn?.size} "
id_card_huixue_num.setTextColor(Color.parseColor("#FF2E31"))
id_card_huixue_num.setTextColor(Color.parseColor("#4C84FF"))
id_card_huixue_num.textSize = 12f
id_card_huixue_suo.visibility = View.GONE
......
moduleMain/src/main/java/com/zxhl/main/page/activity/LotteryRuslutActivity.kt
View file @ ec8ac22f
......@@ -635,7 +635,7 @@ class LotteryRuslutActivity : BaseActivity(), LotteryContract.View, AdCallback<S
//暴击卡
if (!result.criticalHit.isNullOrEmpty()) {
id_card_baoji_num.text = " x${result.criticalHit?.size} "
id_card_baoji_num.setTextColor(Color.parseColor("#FF2E31"))
id_card_baoji_num.setTextColor(Color.parseColor("#4C84FF"))
id_card_baoji_num.textSize = 12f
id_card_baoji_suo.visibility = View.GONE
} else {
......@@ -647,7 +647,7 @@ class LotteryRuslutActivity : BaseActivity(), LotteryContract.View, AdCallback<S
//重抽卡
if (!result.rePumping.isNullOrEmpty()) {
id_card_chongchou_num.text = " x${result.rePumping?.size} "
id_card_chongchou_num.setTextColor(Color.parseColor("#FF2E31"))
id_card_chongchou_num.setTextColor(Color.parseColor("#4C84FF"))
id_card_chongchou_num.textSize = 12f
id_card_chongchou_suo.visibility = View.GONE
......@@ -661,7 +661,7 @@ class LotteryRuslutActivity : BaseActivity(), LotteryContract.View, AdCallback<S
//回血卡
if (!result.bloodReturn.isNullOrEmpty()) {
id_card_huixue_num.text = " x${result.bloodReturn?.size} "
id_card_huixue_num.setTextColor(Color.parseColor("#FF2E31"))
id_card_huixue_num.setTextColor(Color.parseColor("#4C84FF"))
id_card_huixue_num.textSize = 12f
id_card_huixue_suo.visibility = View.GONE
......
moduleMain/src/main/java/com/zxhl/main/page/adapter/BoxAdapter.kt
View file @ ec8ac22f
......@@ -97,7 +97,7 @@ class BoxAdapter : BaseRecyclerAdapter<HomeBoxListEntity, RecyclerView.ViewHolde
holder.id_tv_one_lottery?.setOnClickListener {
listener.onItemClick(it, position, bean)
}
var mAdapter: ItemGoodsAdapter? = ItemGoodsAdapter(mContext)
var mAdapter: ItemGoodsAdapter? = ItemGoodsAdapter(mContext,bean.boxId)
holder.item_rl_goods?.layoutManager =
LinearLayoutManager(mContext, RecyclerView.HORIZONTAL, false)
holder.item_rl_goods?.adapter = mAdapter
......
moduleMain/src/main/java/com/zxhl/main/page/adapter/BoxOrderAdapter.kt
View file @ ec8ac22f
......@@ -38,7 +38,7 @@ class BoxOrderAdapter : BaseRecyclerAdapter<ShopOrderEntity, BoxOrderAdapter.Vie
var discount=AppContext.get().getString(R.string.discount)
var express_fee=AppContext.get().getString(R.string.express_fee)
holder.id_tv_pricedesc?.text = "${total}:$${bean.totalPrice}｜${discount}:$${bean.discount}｜${express_fee}:$${bean.freight}"
holder.id_tv_order_no?.text = "${bean.orderNo} |"
holder.id_tv_order_no?.text = "${bean.orderNo}"
holder.id_tv_pay_time?.text = bean.payTime
var mAdapter: ItemOrderAdapter? = ItemOrderAdapter(mContext)
holder.id_rl_order_item?.layoutManager =
......
moduleMain/src/main/java/com/zxhl/main/page/adapter/ItemGoodsAdapter.kt
View file @ ec8ac22f
......@@ -16,11 +16,13 @@ import com.zxhl.main.R
class ItemGoodsAdapter : BaseRecyclerAdapter<GoodList, ItemGoodsAdapter.ViewHolder> {
private var mContext: Context? = null
private var boxId:String?=""
constructor(
content: Context?
content: Context?,
boxId:String?
) : super() {
mContext = content
this.boxId=boxId
}
override fun onBindViewHolder(holder: ViewHolder, position: Int) {
......@@ -29,7 +31,7 @@ class ItemGoodsAdapter : BaseRecyclerAdapter<GoodList, ItemGoodsAdapter.ViewHold
holder.item_goods_name?.text = bean.productName
holder.item_goods_price?.text = "$${bean.salePriceStr}"
holder.id_tv_item_layout?.setOnClickListener {
JumpUtils.goodsDetailJump(bean?.boxId)
JumpUtils.goodsDetailJump(boxId)
}
}
......
moduleMain/src/main/java/com/zxhl/main/page/adapter/ItemOrderAdapter.kt
View file @ ec8ac22f
......@@ -32,7 +32,7 @@ class ItemOrderAdapter : BaseRecyclerAdapter<GoodList, ItemOrderAdapter.ViewHold
holder.id_tv_courier_no?.text = bean.trackingNo
holder.id_img_copy?.visibility = View.VISIBLE
} else {
holder.id_tv_courier_no?.text = "生成中…"
//holder.id_tv_courier_no?.text = "生成中…"
holder.id_img_copy?.visibility = View.GONE
}
holder.id_img_copy?.setOnClickListener {
......@@ -68,7 +68,7 @@ class ItemOrderAdapter : BaseRecyclerAdapter<GoodList, ItemOrderAdapter.ViewHold
var id_tv_courier_no: TextView?
var id_tv_sale_price: TextView?
var id_tv_nums: TextView?
var id_img_copy: ImageView?
var id_img_copy: TextView?
......@@ -82,7 +82,7 @@ class ItemOrderAdapter : BaseRecyclerAdapter<GoodList, ItemOrderAdapter.ViewHold
id_tv_courier_no = itemView.findViewById<TextView>(R.id.id_tv_courier_no)
id_tv_sale_price = itemView.findViewById<TextView>(R.id.id_tv_sale_price)
id_tv_nums = itemView.findViewById<TextView>(R.id.id_tv_nums)
id_img_copy = itemView.findViewById<ImageView>(R.id.id_img_copy)
id_img_copy = itemView.findViewById<TextView>(R.id.id_img_copy)
id_img_goods = itemView.findViewById<RecycleImageView>(R.id.id_img_goods)
}
......
moduleMain/src/main/java/com/zxhl/main/page/adapter/ShopOrderAdapter.kt
View file @ ec8ac22f
......@@ -59,7 +59,7 @@ class ShopOrderAdapter : BaseRecyclerAdapter<ShopOrderEntity, ShopOrderAdapter.V
holder.id_img_goods?.setLoadImageUrl(bean.goodsList?.get(0)?.mainImage, false)
holder.id_tv_nums?.text = "x ${bean.goodsList?.get(0)?.amount}"
holder.id_tv_sale_price?.text = "$ ${bean.goodsList?.get(0)?.salePriceStr}"
holder.id_tv_order_no?.text = "${bean.orderNo} |"
holder.id_tv_order_no?.text = "${bean.orderNo}"
holder.id_tv_pay_time?.text = bean.payTime
}
......
moduleMain/src/main/java/com/zxhl/main/page/view/DialogUtils.kt
View file @ ec8ac22f
......@@ -144,7 +144,7 @@ object DialogUtils {
tips.visibility = View.GONE
} else {
leftBtn.text = "下次使用"
leftBtn.setTextColor(Color.parseColor("#FF2E31"))
leftBtn.setTextColor(Color.parseColor("#4C84FF"))
leftBtn.background = ContextCompat.getDrawable(
context,
R.drawable.shape_ff2e31_r25_stoke
......
moduleMain/src/main/res/drawable/shape_ffffff_r10_stoke_999999.xml 0 → 100644
View file @ ec8ac22f
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<stroke
android:width="1dp"
android:color="#ff999999" />
<solid android:color="#ffffffff" />
<corners android:radius="10dp" />
</shape>
\ No newline at end of file
moduleMain/src/main/res/layout/activity_layout_goods_receive.xml
View file @ ec8ac22f
......@@ -154,7 +154,7 @@
android:drawableLeft="@drawable/icon_jinbi"
android:drawablePadding="5dp"
android:text="0"
android:textColor="#FF2E31"
android:textColor="#4C84FF"
android:textSize="18sp" />
</LinearLayout>
</RelativeLayout>
......
moduleMain/src/main/res/layout/activity_layout_lottery_box.xml
View file @ ec8ac22f
......@@ -11,7 +11,7 @@
android:layout_centerHorizontal="true"
android:layout_marginTop="88dp"
android:text="召唤幸运符号"
android:textColor="#FF2E31"
android:textColor="#4C84FF"
android:textSize="30sp"
android:textStyle="bold" />
......
moduleMain/src/main/res/layout/activity_layout_order_detail.xml
View file @ ec8ac22f
......@@ -327,7 +327,7 @@
android:layout_marginRight="5dp"
android:layout_toRightOf="@id/id_tv_yingfu"
android:text="$"
android:textColor="#FF2E31"
android:textColor="#4C84FF"
android:textSize="13sp" />
<TextView
......@@ -337,7 +337,7 @@
android:layout_marginTop="12dp"
android:layout_toRightOf="@+id/id_tv_rmb"
android:text=""
android:textColor="#FF2E31"
android:textColor="#4C84FF"
android:textSize="24sp"
android:textStyle="bold" />
......
moduleMain/src/main/res/layout/activity_layout_shipment_success.xml
View file @ ec8ac22f
......@@ -72,7 +72,7 @@
android:background="@drawable/shape_ff2e31_r25_stoke"
android:gravity="center"
android:text="查看发货订单"
android:textColor="#FF2E31"
android:textColor="#4C84FF"
android:textSize="18sp" />
<TextView
......
moduleMain/src/main/res/layout/activity_layout_shop_order.xml
View file @ ec8ac22f
......@@ -240,7 +240,7 @@
android:layout_marginRight="10dp"
android:layout_toLeftOf="@+id/id_img_chosse_youhui"
android:text="-$0"
android:textColor="#FF2E31"
android:textColor="#4C84FF"
android:textSize="14sp"
android:textStyle="bold" />
......@@ -270,7 +270,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="$ "
android:textColor="#FF2E31"
android:textColor="#4C84FF"
android:textSize="14sp"
android:textStyle="bold" />
......@@ -279,7 +279,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
android:textColor="#FF2E31"
android:textColor="#4C84FF"
android:textSize="18sp"
android:textStyle="bold" />
</LinearLayout>
......
moduleMain/src/main/res/layout/activity_login.xml
View file @ ec8ac22f
......@@ -330,7 +330,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=" 用户协议 "
android:textColor="#FF2E31"
android:textColor="#4C84FF"
android:textSize="13sp"/>
<TextView
android:layout_width="wrap_content"
......@@ -343,7 +343,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=" 隐私政策 "
android:textColor="#FF2E31"
android:textColor="#4C84FF"
android:textSize="13sp"/>
</LinearLayout>
......
moduleMain/src/main/res/layout/dialog_layout_recycle.xml
View file @ ec8ac22f
......@@ -23,9 +23,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/recycle_desc"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:text="@string/recycle_desc"
android:textColor="@color/color_333333"
android:textSize="18sp"
android:textStyle="bold"
......@@ -37,9 +37,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="5dp"
android:drawableLeft="@drawable/icon_mobi"
android:drawablePadding="5dp"
android:layout_margin="5dp"
android:text="0"
android:textColor="@color/color_333333"
android:textSize="18sp"
......@@ -60,13 +60,16 @@
<TextView
android:id="@+id/id_tv_sure_recycle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="40dp"
android:layout_marginLeft="45dp"
android:layout_marginTop="25dp"
android:layout_marginRight="45dp"
android:layout_marginBottom="25dp"
android:background="@drawable/shape_4c84ff_r20"
android:gravity="center"
android:text="@string/make_sure_recycle"
android:textColor="@color/color_4c84ff"
android:textSize="15sp"
android:textColor="@color/white"
android:textSize="18sp"
android:textStyle="bold" />
</LinearLayout>
</LinearLayout>
moduleMain/src/main/res/layout/fragment_layout_other.xml
View file @ ec8ac22f
......@@ -27,7 +27,7 @@
android:paddingRight="10dp"
android:paddingBottom="5dp"
android:text="实物商品"
android:textColor="#FF2E31"
android:textColor="#4C84FF"
android:textSize="14sp" />
<TextView
......
moduleMain/src/main/res/layout/item_goods_pool.xml
View file @ ec8ac22f
......@@ -49,7 +49,7 @@
android:layout_toRightOf="@+id/id_tv_cankao_jia"
android:includeFontPadding="false"
android:text="$"
android:textColor="#FF2E31"
android:textColor="#4C84FF"
android:textSize="13sp" />
<TextView
......@@ -61,7 +61,7 @@
android:layout_toRightOf="@+id/id_tv_bizhong"
android:includeFontPadding="false"
android:text="1099"
android:textColor="#FF2E31"
android:textColor="#4C84FF"
android:textSize="18sp" />
<TextView
......
moduleMain/src/main/res/layout/item_layout_box.xml
View file @ ec8ac22f
......@@ -65,7 +65,7 @@
android:drawablePadding="6dp"
android:includeFontPadding="false"
android:text="29"
android:textColor="#FF2E31"
android:textColor="#4C84FF"
android:textSize="24sp" />
<TextView
......@@ -94,7 +94,7 @@
android:includeFontPadding="false"
android:padding="3dp"
android:text="30～10499元"
android:textColor="#FF2E31"
android:textColor="#4C84FF"
android:textSize="11sp" />
<TextView
......
moduleMain/src/main/res/layout/item_layout_receive.xml
View file @ ec8ac22f
......@@ -108,7 +108,7 @@
android:drawablePadding="5dp"
android:includeFontPadding="false"
android:text="20"
android:textColor="#FF2E31"
android:textColor="#4C84FF"
android:textSize="18sp"
android:textStyle="bold" />
</RelativeLayout>
moduleMain/src/main/res/layout/item_layout_recover_detail.xml
View file @ ec8ac22f
......@@ -52,7 +52,7 @@
android:drawablePadding="5dp"
android:includeFontPadding="false"
android:text="20"
android:textColor="#FF2E31"
android:textColor="#4C84FF"
android:textSize="12sp"
android:textStyle="bold" />
......@@ -87,7 +87,7 @@
android:layout_toRightOf="@id/id_img_icon"
android:includeFontPadding="false"
android:text="20"
android:textColor="#FF2E31"
android:textColor="#4C84FF"
android:textSize="12sp"
android:textStyle="bold" />
</RelativeLayout>
moduleMain/src/main/res/layout/item_layout_shop_order.xml
View file @ ec8ac22f
......@@ -28,19 +28,21 @@
android:text="YT129845086740"
android:textColor="@color/color_999999"
android:textSize="12sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="|"
android:layout_marginLeft="10dp"/>
<TextView
android:id="@+id/id_img_copy"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="1dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:text="@string/copy" />
android:layout_marginLeft="5dp"
android:background="@drawable/shape_ffffff_r10_stoke_999999"
android:gravity="center"
android:paddingLeft="5dp"
android:paddingTop="2dp"
android:paddingRight="5dp"
android:paddingBottom="2dp"
android:text="@string/copy"
android:textColor="@color/color_999999"
android:textSize="12sp" />
<TextView
android:id="@+id/id_tv_status"
......@@ -91,7 +93,6 @@
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_toRightOf="@+id/id_tv_goods_name"
android:text="$199"
android:textColor="@color/color_333333"
android:textSize="14sp" />
</LinearLayout>
......@@ -102,7 +103,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:text="x 1"
android:textColor="@color/color_666666"
android:textSize="12sp" />
</LinearLayout>
......@@ -125,7 +125,6 @@
android:id="@+id/id_tv_pricedesc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="222"
android:layout_gravity="right"
android:textColor="@color/color_999999"
android:textSize="12sp" />
......@@ -133,10 +132,9 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginTop="5dp"
android:gravity="right"
>
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
......@@ -185,10 +183,15 @@
android:id="@+id/img_order_no_copy"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:background="@drawable/shape_ffffff_r10_stoke_999999"
android:gravity="center"
android:paddingLeft="5dp"
android:paddingTop="2dp"
android:paddingRight="5dp"
android:paddingBottom="2dp"
android:text="@string/copy"
android:textColor="@color/color_333333"
android:textColor="@color/color_999999"
android:textSize="12sp" />
</LinearLayout>
......
moduleMain/src/main/res/layout/items_layout_box_order.xml
View file @ ec8ac22f
......@@ -13,32 +13,41 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="10dp">
<TextView
android:id="@+id/id_tv_pricedesc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="总价:$2999｜优惠:$20｜运费:$25｜"
android:layout_gravity="right"
android:textColor="@color/color_999999"
android:textSize="12sp" />
<TextView
android:layout_width="wrap_content"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="实付:"
android:textColor="@color/color_333333"
android:textSize="12sp" />
android:layout_marginTop="5dp"
android:gravity="right"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/paid"
android:textColor="@color/color_333333"
android:textSize="12sp" />
<TextView
android:id="@+id/id_tv_total_price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/color_4c84ff"
android:textSize="12sp" />
</LinearLayout>
<TextView
android:id="@+id/id_tv_total_price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="$79"
android:textColor="@color/color_4c84ff"
android:textSize="12sp" />
</LinearLayout>
<LinearLayout
......@@ -51,25 +60,35 @@
android:layout_width="70dp"
android:layout_height="wrap_content"
android:layout_marginRight="5dp"
android:text="订单号："
android:text="@string/orderno"
android:textColor="@color/color_999999"
android:textSize="12sp" />
<TextView
android:id="@+id/id_tv_order_no"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="1298450867405086740"
android:lines="1"
android:ellipsize="end"
android:layout_weight="1"
android:gravity="right"
android:textColor="@color/color_999999"
android:textSize="12sp" />
<ImageView
<TextView
android:id="@+id/img_order_no_copy"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:background="@drawable/shape_ffffff_r10_stoke_999999"
android:gravity="center"
android:paddingLeft="5dp"
android:paddingTop="2dp"
android:paddingRight="5dp"
android:src="@drawable/icon_copy" />
android:paddingBottom="2dp"
android:text="@string/copy"
android:textColor="@color/color_999999"
android:textSize="12sp"/>
</LinearLayout>
<LinearLayout
......@@ -81,15 +100,18 @@
android:layout_width="70dp"
android:layout_height="wrap_content"
android:layout_marginRight="5dp"
android:text="付款时间："
android:text="@string/paytime"
android:textColor="@color/color_999999"
android:textSize="12sp" />
<TextView
android:id="@+id/id_tv_pay_time"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="1298450867405086740"
android:layout_weight="1"
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 @ ec8ac22f
......@@ -3,6 +3,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -13,7 +14,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="快递单号："
android:text="@string/trackingno"
android:textColor="@color/color_999999"
android:textSize="12sp" />
......@@ -22,18 +23,24 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:text="YT129845086740"
android:textColor="@color/color_999999"
android:textSize="12sp" />
<ImageView
<TextView
android:id="@+id/id_img_copy"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="1dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:src="@drawable/icon_copy" />
android:layout_marginLeft="5dp"
android:background="@drawable/shape_ffffff_r10_stoke_999999"
android:gravity="center"
android:paddingLeft="5dp"
android:paddingTop="2dp"
android:paddingRight="5dp"
android:paddingBottom="2dp"
android:text="@string/copy"
android:textColor="@color/color_999999"
android:textSize="12sp" />
<TextView
android:id="@+id/id_tv_status"
......@@ -75,8 +82,6 @@
android:layout_weight="1"
android:ellipsize="end"
android:lines="2"
android:text="iPhone13手机iPhone13手机
iPhone13手机iPhone13…"
android:textColor="@color/color_333333"
android:textSize="14sp" />
......@@ -86,7 +91,6 @@ iPhone13手机iPhone13…"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_toRightOf="@+id/id_tv_goods_name"
android:text="$199"
android:textColor="@color/color_333333"
android:textSize="14sp" />
</LinearLayout>
......@@ -97,12 +101,12 @@ iPhone13手机iPhone13…"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:text="x 1"
android:textColor="@color/color_666666"
android:textSize="12sp" />
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
......
moduleMain/src/main/res/layout/layout_new_people.xml
View file @ ec8ac22f
......@@ -74,7 +74,7 @@
android:paddingRight="5dp"
android:paddingBottom="2.5dp"
android:text=""
android:textColor="#FF2E31"
android:textColor="#4C84FF"
android:textSize="11sp" />
<TextView
......@@ -110,7 +110,7 @@
android:layout_marginRight="4dp"
android:includeFontPadding="false"
android:text="19"
android:textColor="#FF2E31"
android:textColor="#4C84FF"
android:textSize="24sp" />
<TextView
......@@ -149,7 +149,7 @@
android:includeFontPadding="false"
android:padding="3dp"
android:text="30～10499元"
android:textColor="#FF2E31"
android:textColor="#4C84FF"
android:textSize="11sp" />
<TextView
......
moduleMain/src/main/res/layout/layout_popup_protection_poll.xml
View file @ ec8ac22f
......@@ -80,7 +80,7 @@
android:paddingTop="2dp"
android:paddingBottom="2dp"
android:text="全部"
android:textColor="#FF2E31"
android:textColor="#4C84FF"
android:textSize="14sp" />
<TextView
......
moduleMain/src/main/res/layout/popup_layout_recover.xml
View file @ ec8ac22f
......@@ -66,7 +66,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
android:textColor="#FF2E31" />
android:textColor="#4C84FF" />
</LinearLayout>
<TextView
......@@ -98,7 +98,7 @@
android:id="@+id/id_tv_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#FF2E31"
android:textColor="#4C84FF"
android:textSize="15sp"
android:text="0" />
<TextView
......
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