我的账户UI修改
BIN
app/src/common/res/mipmap-xhdpi/common_ic_checked.png
Normal file
After Width: | Height: | Size: 937 B |
Before Width: | Height: | Size: 728 B |
Before Width: | Height: | Size: 462 B After Width: | Height: | Size: 711 B |
Before Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 781 B |
@@ -3,23 +3,20 @@ package com.yizhuan.erban.ui.pay;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.os.Bundle;
|
||||
|
||||
import androidx.recyclerview.widget.GridLayoutManager;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import android.text.TextUtils;
|
||||
import android.view.View;
|
||||
import android.widget.ImageView;
|
||||
import android.widget.LinearLayout;
|
||||
import android.widget.TextView;
|
||||
|
||||
import com.alibaba.security.biometrics.build.G;
|
||||
import androidx.recyclerview.widget.GridLayoutManager;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import com.netease.nim.uikit.StatusBarUtil;
|
||||
import com.yizhuan.erban.R;
|
||||
import com.yizhuan.erban.bank_card.activity.AddBankCardAgreementActivity;
|
||||
import com.yizhuan.erban.base.BaseActivity;
|
||||
import com.yizhuan.erban.base.TitleBar;
|
||||
import com.yizhuan.erban.bills.activities.ChargeBillsActivity;
|
||||
import com.yizhuan.erban.common.widget.dialog.DialogManager;
|
||||
import com.yizhuan.erban.ui.setting.ModifyPwdActivity;
|
||||
import com.yizhuan.erban.ui.webview.CommonWebViewActivity;
|
||||
@@ -122,7 +119,7 @@ public class ChargeActivity extends BaseActivity {
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_charge);
|
||||
initTitleBar(getString(R.string.label_charge_gold));
|
||||
initWhiteTitleBar(getString(R.string.label_charge_gold));
|
||||
bindViews();
|
||||
setListener();
|
||||
initiate();
|
||||
@@ -632,7 +629,6 @@ public class ChargeActivity extends BaseActivity {
|
||||
protected void setStatusBar() {
|
||||
super.setStatusBar();
|
||||
StatusBarUtil.transparencyBar(this);
|
||||
StatusBarUtil.StatusBarLightMode(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@@ -1,16 +1,15 @@
|
||||
package com.yizhuan.erban.ui.pay;
|
||||
|
||||
import android.text.TextUtils;
|
||||
import android.widget.ImageView;
|
||||
import android.widget.LinearLayout;
|
||||
import android.widget.RelativeLayout;
|
||||
import android.widget.TextView;
|
||||
|
||||
import com.chad.library.adapter.base.BaseQuickAdapter;
|
||||
import com.chad.library.adapter.base.BaseViewHolder;
|
||||
import com.yizhuan.erban.R;
|
||||
import com.yizhuan.xchat_android_core.pay.bean.ChargeBean;
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
/**
|
||||
* <p> 充值adapter </p>
|
||||
* Created by Administrator on 2017/11/20.
|
||||
@@ -21,30 +20,16 @@ public class ChargeAdapter extends BaseQuickAdapter<ChargeBean, BaseViewHolder>
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void convert(BaseViewHolder baseViewHolder, ChargeBean chargeBean) {
|
||||
protected void convert(@NotNull BaseViewHolder baseViewHolder, ChargeBean chargeBean) {
|
||||
if (chargeBean == null) return;
|
||||
|
||||
baseViewHolder.setVisible(R.id.ll_gold_charge, !TextUtils.isEmpty(chargeBean.getProdName()));
|
||||
|
||||
baseViewHolder
|
||||
baseViewHolder.setVisible(R.id.ll_gold_charge, !TextUtils.isEmpty(chargeBean.getProdName()))
|
||||
.setText(R.id.tv_money_gold, chargeBean.prodName.replace("钻石", ""))
|
||||
.setText(R.id.cb_money, mContext.getString(R.string.charge_number, chargeBean.money));
|
||||
|
||||
|
||||
LinearLayout rl_gold_charge = baseViewHolder.getView(R.id.ll_gold_charge);
|
||||
// TextView tv_money_gold = baseViewHolder.getView(R.id.tv_money_gold);
|
||||
// TextView cb_money = baseViewHolder.getView(R.id.cb_money);
|
||||
rl_gold_charge.setSelected(chargeBean.isSelected);
|
||||
// if(chargeBean.isSelected){
|
||||
// tv_money_gold.setTextColor(mContext.getResources().getColor(R.color.color_333333));
|
||||
// cb_money.setTextColor(mContext.getResources().getColor(R.color.color_333333));
|
||||
// } else {
|
||||
// tv_money_gold.setTextColor(mContext.getResources().getColor(R.color.color_999999));
|
||||
// cb_money.setTextColor(mContext.getResources().getColor(R.color.color_999999));
|
||||
// }
|
||||
|
||||
//跟iOS逻辑一致,如果1元则显示首充的icon
|
||||
// baseViewHolder.setGone(R.id.iv_first_recharge, chargeBean.getMoney() == 1);
|
||||
|
||||
}
|
||||
|
||||
|
@@ -0,0 +1,8 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<item android:color="@color/app_248cfe" android:state_selected="true" />
|
||||
|
||||
<item android:color="@color/white" />
|
||||
|
||||
</selector>
|
@@ -4,8 +4,8 @@
|
||||
|
||||
<gradient
|
||||
android:angle="180"
|
||||
android:endColor="#ff218eff"
|
||||
android:startColor="#ff7727e4"
|
||||
android:endColor="@color/color_218eff"
|
||||
android:startColor="@color/color_7727e4"
|
||||
android:type="linear"
|
||||
android:useLevel="true" />
|
||||
<corners android:radius="19dp" />
|
||||
|
@@ -4,8 +4,8 @@
|
||||
|
||||
<gradient
|
||||
android:angle="180"
|
||||
android:startColor="#735FFE"
|
||||
android:endColor="#8776FF"/>
|
||||
android:startColor="@color/color_7727e4"
|
||||
android:endColor="@color/color_218eff"/>
|
||||
<corners android:radius="22dp"/>
|
||||
|
||||
</shape>
|
@@ -1,8 +1,17 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:state_selected="true" android:drawable="@drawable/bg_charge_item_press" />
|
||||
<item android:state_checked="true" android:drawable="@drawable/bg_charge_item_press" />
|
||||
<item android:state_checked="false" android:drawable="@drawable/bg_charge_item_normal" />
|
||||
<item android:state_selected="false" android:drawable="@drawable/bg_charge_item_normal" />
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:state_selected="true">
|
||||
<shape android:shape="rectangle">
|
||||
<corners android:radius="@dimen/dp_5" />
|
||||
<stroke android:width="2dp" android:color="@color/app_248cfe" />
|
||||
<solid android:color="@color/bg_secondary_2a2a39" />
|
||||
</shape>
|
||||
</item>
|
||||
|
||||
<item>
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="@color/bg_secondary_2a2a39" />
|
||||
<corners android:radius="@dimen/dp_5" />
|
||||
</shape>
|
||||
</item>
|
||||
</selector>
|
@@ -4,7 +4,7 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:background="@color/color_FAFAFA"
|
||||
android:background="@color/bg_normal_1c1b22"
|
||||
android:orientation="vertical">
|
||||
|
||||
<ImageView
|
||||
@@ -19,7 +19,7 @@
|
||||
<com.yizhuan.erban.base.TitleBar
|
||||
android:id="@+id/title_bar"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_marginTop="@dimen/dp_23"
|
||||
android:layout_marginTop="@dimen/dp_25"
|
||||
android:layout_height="@dimen/common_toolbar_height"
|
||||
app:layout_constraintTop_toTopOf="parent"/>
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:text="我的钻石"
|
||||
android:textSize="@dimen/dp_13"
|
||||
android:textColor="@color/color_333333"
|
||||
android:textColor="@color/text_title_white"
|
||||
android:drawableStart="@mipmap/ic_charge_diamond"
|
||||
android:drawablePadding="@dimen/dp_4"
|
||||
android:layout_below="@id/title_bar"
|
||||
@@ -70,8 +70,8 @@
|
||||
android:id="@+id/recyclerView"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingStart="@dimen/dp_15"
|
||||
android:paddingEnd="@dimen/dp_15"
|
||||
android:paddingStart="@dimen/dp_11"
|
||||
android:paddingEnd="@dimen/dp_11"
|
||||
android:visibility="visible" />
|
||||
|
||||
|
||||
@@ -80,7 +80,7 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
app:layout_constraintTop_toBottomOf="@id/recyclerView"
|
||||
android:background="@drawable/bg_corner_shadow_12"
|
||||
android:background="@drawable/bg_2a2a39_0_15"
|
||||
android:layout_marginStart="@dimen/dp_15"
|
||||
android:layout_marginEnd="@dimen/dp_15"
|
||||
android:layout_marginTop="@dimen/dp_13"
|
||||
@@ -92,7 +92,7 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:text="支付方式"
|
||||
android:textSize="@dimen/dp_13"
|
||||
android:textColor="@color/color_666666"
|
||||
android:textColor="@color/text_normal_c6c6e9"
|
||||
android:layout_marginTop="@dimen/dp_15"
|
||||
android:layout_marginStart="@dimen/dp_15"
|
||||
/>
|
||||
@@ -128,7 +128,7 @@
|
||||
android:layout_weight="1"
|
||||
android:text=""
|
||||
android:textSize="@dimen/dp_15"
|
||||
android:textColor="@color/color_333333"
|
||||
android:textColor="@color/text_title_white"
|
||||
android:clickable="false" />
|
||||
|
||||
<ImageView
|
||||
@@ -144,7 +144,7 @@
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
android:background="@color/color_F5F5F5"
|
||||
android:background="@color/line_color_353548"
|
||||
android:layout_marginTop="@dimen/dp_20"
|
||||
android:layout_marginEnd="@dimen/dp_15"
|
||||
android:layout_marginStart="@dimen/dp_50"
|
||||
@@ -177,7 +177,7 @@
|
||||
android:layout_weight="1"
|
||||
android:text=""
|
||||
android:textSize="@dimen/dp_15"
|
||||
android:textColor="@color/color_333333"
|
||||
android:textColor="@color/text_title_white"
|
||||
android:clickable="false" />
|
||||
|
||||
<ImageView
|
||||
@@ -212,7 +212,7 @@
|
||||
android:text="展开更多支付方式"
|
||||
android:drawableEnd="@drawable/ic_charge_arrow"
|
||||
android:textSize="@dimen/dp_13"
|
||||
android:textColor="@color/color_666666"
|
||||
android:textColor="@color/text_normal_c6c6e9"
|
||||
android:paddingBottom="@dimen/dp_15"
|
||||
android:clickable="false" />
|
||||
|
||||
@@ -250,7 +250,7 @@
|
||||
android:text="@string/charge_agreement"
|
||||
android:textSize="@dimen/sp_12"
|
||||
android:gravity="center"
|
||||
android:textColor="@color/color_999999"
|
||||
android:textColor="@color/text_secondary_4f516a"
|
||||
/>
|
||||
|
||||
<TextView
|
||||
@@ -258,7 +258,7 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/agreement"
|
||||
android:textColor="@color/appColor"
|
||||
android:textColor="@color/app_248cfe"
|
||||
android:gravity="center"
|
||||
android:textSize="@dimen/sp_12"
|
||||
/>
|
||||
@@ -269,7 +269,7 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="如有任何问题咨询客服微信:xingqiu66kefu"
|
||||
android:textColor="@color/appColor"
|
||||
android:textColor="@color/app_248cfe"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:textSize="@dimen/sp_12"
|
||||
android:layout_marginBottom="@dimen/dp_10"
|
||||
|
@@ -1,16 +1,14 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@+id/ll_gold_charge"
|
||||
android:layout_width="105dp"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="85dp"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:gravity="center"
|
||||
|
||||
android:orientation="vertical"
|
||||
android:layout_margin="@dimen/dp_4"
|
||||
android:background="@drawable/selector_gold_price" >
|
||||
|
||||
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
@@ -20,39 +18,28 @@
|
||||
android:id="@+id/tv_money_gold"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textColor="@color/appColor"
|
||||
android:textColor="@color/color_selector_app_color_false_white"
|
||||
android:includeFontPadding="false"
|
||||
android:textSize="16dp"
|
||||
android:textSize="18dp"
|
||||
tools:text="8" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:text="@string/diamond"
|
||||
android:textSize="@dimen/dp_9"
|
||||
android:textSize="@dimen/dp_11"
|
||||
android:gravity="center_vertical"
|
||||
android:layout_marginStart="@dimen/dp_5"
|
||||
android:textColor="@color/color_333333"
|
||||
android:textColor="@color/text_normal_c6c6e9"
|
||||
/>
|
||||
</LinearLayout>
|
||||
|
||||
<!-- <ImageView-->
|
||||
<!-- android:id="@+id/iv_first_recharge"-->
|
||||
<!-- android:layout_width="wrap_content"-->
|
||||
<!-- android:layout_height="wrap_content"-->
|
||||
<!-- android:layout_centerVertical="true"-->
|
||||
<!-- android:layout_marginEnd="@dimen/dp_5"-->
|
||||
<!-- android:layout_toStartOf="@+id/cb_money"-->
|
||||
<!-- android:src="@drawable/icon_first_recharge"-->
|
||||
<!-- android:visibility="gone"-->
|
||||
<!-- tools:visibility="visible" />-->
|
||||
|
||||
<TextView
|
||||
android:id="@+id/cb_money"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="13dp"
|
||||
android:textSize="15dp"
|
||||
tools:text="¥8元"
|
||||
tools:textColor="@color/color_999999" />
|
||||
android:textColor="@color/text_normal_c6c6e9" />
|
||||
|
||||
</LinearLayout>
|
||||
|
Before Width: | Height: | Size: 163 KiB After Width: | Height: | Size: 299 KiB |