充值页面UI修改
@@ -1,11 +1,17 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:drawable="@drawable/dialog_charge_bg_checked" android:state_selected="true" />
|
||||
<item android:drawable="@drawable/dialog_charge_bg_checked" android:state_checked="true" />
|
||||
<item android:state_selected="true">
|
||||
<shape android:shape="rectangle">
|
||||
<stroke android:width="1dp" android:color="#ffffe710" />
|
||||
<solid android:color="#26ffe710" />
|
||||
<corners android:bottomLeftRadius="8dp" android:bottomRightRadius="8dp" android:topLeftRadius="8dp" android:topRightRadius="8dp" />
|
||||
</shape>
|
||||
</item>
|
||||
|
||||
<item>
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="@color/white" />
|
||||
<corners android:radius="8dp"/>
|
||||
<solid android:color="#fff8f8fa" />
|
||||
<corners android:bottomLeftRadius="10dp" android:bottomRightRadius="10dp" android:topLeftRadius="10dp" android:topRightRadius="10dp" />
|
||||
</shape>
|
||||
</item>
|
||||
|
||||
|
@@ -64,7 +64,6 @@ public class RadishRecordActivity extends BaseMvpActivity<IRadishRecordView, Rad
|
||||
super.setStatusBar();
|
||||
StatusBarUtil.transparencyBar(this);
|
||||
StatusBarUtil.StatusBarLightMode(this);
|
||||
StatusBarUtil.StatusBarLightMode(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@@ -77,11 +77,9 @@ public class ChargeActivity extends BaseActivity {
|
||||
List<ChargeBean> mList;
|
||||
private TextView mTv_gold;
|
||||
private LinearLayout ll_type_first;
|
||||
private ImageView iv_sel_first;
|
||||
private ImageView iv_type_first;
|
||||
private TextView tv_type_first;
|
||||
private LinearLayout ll_type_second;
|
||||
private ImageView iv_sel_second;
|
||||
private ImageView iv_type_second;
|
||||
private TextView tv_type_second;
|
||||
private TextView tvCharge;
|
||||
@@ -167,11 +165,9 @@ public class ChargeActivity extends BaseActivity {
|
||||
private void bindViews() {
|
||||
mTv_gold = findViewById(R.id.tv_gold);
|
||||
ll_type_first = findViewById(R.id.ll_type_first);
|
||||
iv_sel_first = findViewById(R.id.iv_sel_first);
|
||||
iv_type_first = findViewById(R.id.iv_type_first);
|
||||
ll_type_second = findViewById(R.id.ll_type_second);
|
||||
ll_more = findViewById(R.id.ll_more);
|
||||
iv_sel_second = findViewById(R.id.iv_sel_second);
|
||||
tvCharge = findViewById(R.id.tv_charge);
|
||||
tvAgreement = findViewById(R.id.tv_agreement);
|
||||
iv_type_second = findViewById(R.id.iv_type_second);
|
||||
@@ -207,19 +203,20 @@ public class ChargeActivity extends BaseActivity {
|
||||
switch (defaultPay) {
|
||||
case ALI_PAY_CLOSE:
|
||||
case ALI_PAY_OPEN:
|
||||
iv_sel_first.setSelected(selectAliPay);
|
||||
iv_sel_second.setSelected(selectWeChatPay);
|
||||
ll_type_first.setSelected(selectAliPay);
|
||||
ll_type_second.setSelected(selectWeChatPay);
|
||||
break;
|
||||
|
||||
case WX_PAY_CLOSE:
|
||||
case WX_PAY_OPEN:
|
||||
iv_sel_first.setSelected(selectWeChatPay);
|
||||
iv_sel_second.setSelected(selectAliPay);
|
||||
ll_type_first.setSelected(selectWeChatPay);
|
||||
ll_type_second.setSelected(selectAliPay);
|
||||
break;
|
||||
default:
|
||||
defaultSetPay(selectWeChatPay, selectAliPay);
|
||||
break;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -229,8 +226,8 @@ public class ChargeActivity extends BaseActivity {
|
||||
* @param selectAliPay
|
||||
*/
|
||||
private void defaultSetPay(boolean selectWeChatPay, boolean selectAliPay) {
|
||||
iv_sel_first.setSelected(selectWeChatPay);
|
||||
iv_sel_second.setSelected(selectAliPay);
|
||||
ll_type_first.setSelected(selectWeChatPay);
|
||||
ll_type_second.setSelected(selectAliPay);
|
||||
}
|
||||
|
||||
private void initiate() {
|
||||
@@ -574,8 +571,8 @@ public class ChargeActivity extends BaseActivity {
|
||||
}
|
||||
|
||||
private void setAliPayFirst(int defaultType) {
|
||||
iv_type_first.setImageDrawable(getResources().getDrawable(R.drawable.ic_ali_charge));
|
||||
iv_type_second.setImageDrawable(getResources().getDrawable(R.drawable.ic_wechat_charge));
|
||||
iv_type_first.setImageDrawable(getResources().getDrawable(R.drawable.dialog_charge_ic_alipay));
|
||||
iv_type_second.setImageDrawable(getResources().getDrawable(R.drawable.dialog_charge_ic_wechat));
|
||||
tv_type_first.setText("支付宝");
|
||||
tv_type_second.setText("微信");
|
||||
ll_type_first.setOnClickListener(v -> selectPayChannelDisplay(Constants.CHARGE_ALIPAY, defaultType));
|
||||
@@ -588,8 +585,8 @@ public class ChargeActivity extends BaseActivity {
|
||||
}
|
||||
|
||||
private void setWxPayFirst(int defaultType) {
|
||||
iv_type_first.setImageDrawable(getResources().getDrawable(R.drawable.ic_wechat_charge));
|
||||
iv_type_second.setImageDrawable(getResources().getDrawable(R.drawable.ic_ali_charge));
|
||||
iv_type_first.setImageDrawable(getResources().getDrawable(R.drawable.dialog_charge_ic_alipay));
|
||||
iv_type_second.setImageDrawable(getResources().getDrawable(R.drawable.dialog_charge_ic_wechat));
|
||||
tv_type_first.setText("微信");
|
||||
tv_type_second.setText("支付宝");
|
||||
ll_type_first.setOnClickListener(v -> selectPayChannelDisplay(Constants.CHARGE_WX, defaultType));
|
||||
@@ -617,6 +614,7 @@ public class ChargeActivity extends BaseActivity {
|
||||
protected void setStatusBar() {
|
||||
super.setStatusBar();
|
||||
StatusBarUtil.transparencyBar(this);
|
||||
StatusBarUtil.StatusBarLightMode(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@@ -272,7 +272,6 @@ public class PrivacySettingActivity extends BaseActivity {
|
||||
super.setStatusBar();
|
||||
StatusBarUtil.transparencyBar(this);
|
||||
StatusBarUtil.StatusBarLightMode(this);
|
||||
StatusBarUtil.StatusBarLightMode(this);
|
||||
}
|
||||
|
||||
|
||||
|
@@ -183,6 +183,5 @@ public class ResetPasswordActivity extends BaseBindingActivity<ActivityResetLogi
|
||||
super.setStatusBar();
|
||||
StatusBarUtil.transparencyBar(this);
|
||||
StatusBarUtil.StatusBarLightMode(this);
|
||||
StatusBarUtil.StatusBarLightMode(this);
|
||||
}
|
||||
}
|
||||
|
Before Width: | Height: | Size: 4.3 KiB After Width: | Height: | Size: 2.5 KiB |
Before Width: | Height: | Size: 4.1 KiB After Width: | Height: | Size: 2.6 KiB |
@@ -1,10 +1,10 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:background="@color/bg_normal_1c1b22"
|
||||
android:background="@color/white"
|
||||
android:orientation="vertical">
|
||||
|
||||
<ImageView
|
||||
@@ -20,51 +20,48 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/dp_30"
|
||||
tools:layout_height="50dp"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
tools:layout_height="50dp" />
|
||||
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_title_diamond"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="我的钻石"
|
||||
android:textSize="@dimen/dp_13"
|
||||
android:textColor="@color/color_333333"
|
||||
android:drawableStart="@mipmap/ic_charge_diamond"
|
||||
android:drawablePadding="@dimen/dp_4"
|
||||
android:layout_below="@id/title_bar"
|
||||
android:layout_centerHorizontal="true"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
android:layout_marginTop="@dimen/dp_30"
|
||||
/>
|
||||
android:drawableStart="@mipmap/ic_charge_diamond"
|
||||
android:drawablePadding="@dimen/dp_4"
|
||||
android:text="我的钻石"
|
||||
android:textColor="@color/text_normal_282828"
|
||||
android:textSize="@dimen/dp_13"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_gold"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textColor="@color/color_333333"
|
||||
android:textSize="@dimen/dp_24"
|
||||
android:layout_below="@id/tv_title_diamond"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:fontFamily="sans-serif-medium"
|
||||
android:includeFontPadding="false"
|
||||
tools:text="50" />
|
||||
<TextView
|
||||
android:id="@+id/tv_gold"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/tv_title_diamond"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:fontFamily="sans-serif-medium"
|
||||
android:includeFontPadding="false"
|
||||
android:textColor="@color/text_normal_282828"
|
||||
android:textSize="@dimen/dp_32"
|
||||
tools:text="50" />
|
||||
|
||||
<androidx.core.widget.NestedScrollView
|
||||
android:id="@+id/nsv_charge"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_below="@id/tv_gold"
|
||||
android:layout_marginTop="45dp"
|
||||
>
|
||||
android:layout_below="@id/iv_bg"
|
||||
android:layout_marginTop="20dp">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical"
|
||||
>
|
||||
android:orientation="vertical">
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/recyclerView"
|
||||
@@ -73,158 +70,128 @@
|
||||
android:paddingStart="@dimen/dp_11"
|
||||
android:paddingEnd="@dimen/dp_11"
|
||||
android:visibility="visible" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center"
|
||||
android:layout_marginStart="30dp"
|
||||
android:layout_marginEnd="30dp"
|
||||
android:layout_marginTop="16dp"
|
||||
android:layout_marginEnd="30dp"
|
||||
android:gravity="center"
|
||||
android:text="未成年禁止充值消费!请勿轻易相信各类刷单、退款等信息,以免上当受骗!"
|
||||
android:textColor="@color/color_666666"
|
||||
android:textSize="14sp"
|
||||
/>
|
||||
android:textColor="@color/text_secondary_878b9c"
|
||||
android:textSize="14sp" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
app:layout_constraintTop_toBottomOf="@id/recyclerView"
|
||||
android:background="@drawable/bg_secondary_radius_5"
|
||||
android:layout_marginStart="@dimen/dp_15"
|
||||
android:layout_marginEnd="@dimen/dp_15"
|
||||
android:layout_marginTop="@dimen/dp_16"
|
||||
>
|
||||
|
||||
android:layout_marginEnd="@dimen/dp_15"
|
||||
android:orientation="vertical"
|
||||
app:layout_constraintTop_toBottomOf="@id/recyclerView">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="支付方式"
|
||||
android:textSize="@dimen/dp_13"
|
||||
android:textColor="@color/text_normal_282828"
|
||||
android:layout_marginTop="@dimen/dp_15"
|
||||
android:layout_marginStart="@dimen/dp_15"
|
||||
/>
|
||||
android:layout_marginTop="@dimen/dp_15"
|
||||
android:text="支付方式"
|
||||
android:textColor="@color/text_normal_282828"
|
||||
android:textSize="@dimen/dp_13" />
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/ll_charge_type"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical">
|
||||
android:layout_marginTop="12dp"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/ll_type_first"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="19.5dp"
|
||||
android:paddingStart="15dp"
|
||||
android:paddingEnd="15dp"
|
||||
android:gravity="center_vertical"
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="48dp"
|
||||
android:layout_weight="1"
|
||||
android:background="@drawable/selector_dialog_charge"
|
||||
android:clickable="true"
|
||||
android:focusable="true"
|
||||
android:clickable="true">
|
||||
android:gravity="center"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/iv_type_first"
|
||||
android:layout_width="28dp"
|
||||
android:layout_height="28dp"
|
||||
android:clickable="false" />
|
||||
android:clickable="false"
|
||||
tools:src="@drawable/dialog_charge_ic_wechat" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_type_first"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="10dp"
|
||||
android:layout_weight="1"
|
||||
android:text=""
|
||||
android:textSize="@dimen/dp_15"
|
||||
android:textColor="@color/text_title_282828"
|
||||
android:clickable="false" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/iv_sel_first"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@drawable/selector_check_box_pic_check"
|
||||
android:clickable="false" />
|
||||
|
||||
android:layout_marginStart="13dp"
|
||||
android:clickable="false"
|
||||
android:textColor="@color/text_title_282828"
|
||||
android:textSize="@dimen/dp_15"
|
||||
tools:text="微信支付" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
android:background="@color/line_353548"
|
||||
android:layout_marginTop="@dimen/dp_20"
|
||||
android:layout_marginEnd="@dimen/dp_15"
|
||||
android:layout_marginStart="@dimen/dp_50"
|
||||
/>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/ll_type_second"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="15dp"
|
||||
android:paddingLeft="15dp"
|
||||
android:paddingRight="15dp"
|
||||
android:paddingBottom="@dimen/dp_20"
|
||||
android:gravity="center_vertical"
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="48dp"
|
||||
android:layout_weight="1"
|
||||
android:layout_marginStart="13dp"
|
||||
android:background="@drawable/selector_dialog_charge"
|
||||
android:clickable="true"
|
||||
android:focusable="true"
|
||||
android:clickable="true">
|
||||
android:gravity="center"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/iv_type_second"
|
||||
android:layout_width="28dp"
|
||||
android:layout_height="28dp"
|
||||
android:clickable="false" />
|
||||
android:clickable="false"
|
||||
tools:src="@drawable/dialog_charge_ic_alipay" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_type_second"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="10dp"
|
||||
android:layout_weight="1"
|
||||
android:text=""
|
||||
android:textSize="@dimen/dp_15"
|
||||
android:textColor="@color/text_title_282828"
|
||||
android:clickable="false" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/iv_sel_second"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@drawable/selector_check_box_pic_check"
|
||||
android:clickable="false" />
|
||||
android:layout_marginStart="13dp"
|
||||
android:clickable="false"
|
||||
android:textColor="@color/text_title_282828"
|
||||
android:textSize="@dimen/dp_15"
|
||||
tools:text="支付宝支付" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/ll_more"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_marginTop="15dp"
|
||||
android:gravity="center_vertical"
|
||||
android:layout_width="0dp"
|
||||
android:layout_marginStart="13dp"
|
||||
android:layout_height="48dp"
|
||||
android:layout_weight="1"
|
||||
android:clickable="true"
|
||||
android:focusable="true"
|
||||
android:gravity="center"
|
||||
android:orientation="horizontal"
|
||||
android:visibility="gone"
|
||||
tools:visibility="visible"
|
||||
android:focusable="true"
|
||||
android:clickable="true">
|
||||
tools:visibility="gone">
|
||||
|
||||
<com.nnbc123.library.widget.DrawableCenterTextView
|
||||
android:id="@+id/tv_more"
|
||||
android:layout_width="0dp"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center"
|
||||
android:clickable="false"
|
||||
android:drawableEnd="@drawable/arrow_right"
|
||||
android:drawablePadding="4dp"
|
||||
android:paddingTop="@dimen/dp_6"
|
||||
android:gravity="center"
|
||||
android:text="展开更多支付方式"
|
||||
android:drawableEnd="@drawable/ic_charge_arrow"
|
||||
android:textSize="@dimen/dp_13"
|
||||
android:textColor="@color/text_normal_282828"
|
||||
android:paddingBottom="@dimen/dp_15"
|
||||
android:clickable="false" />
|
||||
android:textSize="@dimen/dp_13" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
@@ -232,63 +199,59 @@
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_charge"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="45dp"
|
||||
android:layout_marginStart="60dp"
|
||||
android:layout_marginTop="39dp"
|
||||
android:layout_marginEnd="@dimen/dp_60"
|
||||
android:background="@drawable/bg_common_confirm_normal"
|
||||
android:gravity="center"
|
||||
android:text="确认充值"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="@dimen/dp_15"
|
||||
app:layout_constraintBottom_toBottomOf="parent" />
|
||||
<TextView
|
||||
android:id="@+id/tv_charge"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="45dp"
|
||||
android:layout_marginStart="60dp"
|
||||
android:layout_marginTop="39dp"
|
||||
android:layout_marginEnd="@dimen/dp_60"
|
||||
android:background="@drawable/bg_common_confirm_normal"
|
||||
android:gravity="center"
|
||||
android:text="确认充值"
|
||||
android:textColor="@color/text_normal_282828"
|
||||
android:textSize="@dimen/dp_15"
|
||||
app:layout_constraintBottom_toBottomOf="parent" />
|
||||
|
||||
<LinearLayout
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:layout_marginTop="@dimen/dp_20"
|
||||
android:layout_marginBottom="@dimen/dp_10"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:layout_marginTop="@dimen/dp_20"
|
||||
android:layout_marginBottom="@dimen/dp_10"
|
||||
android:orientation="horizontal">
|
||||
android:gravity="center"
|
||||
android:text="@string/charge_agreement"
|
||||
android:textColor="@color/text_secondary_878b9c"
|
||||
android:textSize="@dimen/sp_12" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/charge_agreement"
|
||||
android:textSize="@dimen/sp_12"
|
||||
android:gravity="center"
|
||||
android:textColor="@color/text_secondary_878b9c"
|
||||
/>
|
||||
<TextView
|
||||
android:id="@+id/tv_agreement"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center"
|
||||
android:text="@string/agreement"
|
||||
android:textColor="@color/text_normal_282828"
|
||||
android:textSize="@dimen/sp_12" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_agreement"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/agreement"
|
||||
android:textColor="@color/app_248cfe"
|
||||
android:gravity="center"
|
||||
android:textSize="@dimen/sp_12"
|
||||
/>
|
||||
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="如有任何问题请咨询客服,ID:88001"
|
||||
android:textColor="@color/app_248cfe"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:textSize="@dimen/sp_12"
|
||||
android:layout_marginBottom="@dimen/dp_10"
|
||||
/>
|
||||
android:text="如有任何问题请咨询客服,ID:88001"
|
||||
android:textColor="@color/text_secondary_878b9c"
|
||||
android:textSize="@dimen/sp_12" />
|
||||
</LinearLayout>
|
||||
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
|
||||
|
||||
|
||||
</RelativeLayout>
|
||||
|
||||
|
@@ -5,7 +5,7 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="505dp"
|
||||
android:layout_gravity="bottom"
|
||||
android:background="@drawable/shape_f4f4fa_top_8dp"
|
||||
android:background="@drawable/shape_white_top_10dp"
|
||||
android:orientation="vertical">
|
||||
|
||||
<com.nnbc123.app.base.TitleBar
|
||||
@@ -31,7 +31,7 @@
|
||||
android:layout_marginStart="15dp"
|
||||
android:drawablePadding="@dimen/dp_4"
|
||||
android:text="我的钻石:"
|
||||
android:textColor="@color/color_333333"
|
||||
android:textColor="@color/text_secondary_878b9c"
|
||||
android:textSize="@dimen/dp_14" />
|
||||
|
||||
<TextView
|
||||
@@ -40,7 +40,7 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="6dp"
|
||||
android:includeFontPadding="false"
|
||||
android:textColor="@color/color_333333"
|
||||
android:textColor="@color/text_normal_282828"
|
||||
android:textSize="@dimen/dp_15"
|
||||
android:textStyle="bold"
|
||||
tools:text="50" />
|
||||
@@ -55,7 +55,7 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="15dp"
|
||||
android:text="未成年人禁止充值"
|
||||
android:textColor="#ff666666"
|
||||
android:textColor="@color/text_secondary_878b9c"
|
||||
android:textSize="12sp" />
|
||||
|
||||
</LinearLayout>
|
||||
@@ -201,7 +201,7 @@
|
||||
android:background="@drawable/bg_common_confirm_normal"
|
||||
android:gravity="center"
|
||||
android:text="确认充值"
|
||||
android:textColor="@color/white"
|
||||
android:textColor="@color/text_title_282828"
|
||||
android:textSize="@dimen/dp_15"
|
||||
app:layout_constraintBottom_toBottomOf="parent" />
|
||||
|
||||
@@ -227,7 +227,7 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center"
|
||||
android:text="@string/agreement"
|
||||
android:textColor="@color/app_248cfe"
|
||||
android:textColor="@color/text_normal_282828"
|
||||
android:textSize="@dimen/sp_12" />
|
||||
|
||||
</LinearLayout>
|
||||
|
@@ -5,7 +5,7 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="64dp"
|
||||
android:layout_margin="@dimen/dp_4"
|
||||
android:background="@drawable/selector_gold_price"
|
||||
android:background="@drawable/selector_dialog_charge"
|
||||
android:gravity="center"
|
||||
android:orientation="vertical">
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
android:layout_marginStart="5dp"
|
||||
android:fontFamily="sans-serif-medium"
|
||||
android:includeFontPadding="false"
|
||||
android:textColor="@color/color_333333"
|
||||
android:textColor="@color/text_normal_282828"
|
||||
android:textSize="14dp"
|
||||
tools:text="8" />
|
||||
|
||||
@@ -46,7 +46,7 @@
|
||||
android:id="@+id/cb_money"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textColor="@color/color_999999"
|
||||
android:textColor="@color/text_secondary_878b9c"
|
||||
android:textSize="12dp"
|
||||
tools:text="¥8元" />
|
||||
|
||||
|
Before Width: | Height: | Size: 56 KiB After Width: | Height: | Size: 22 KiB |
BIN
app/src/main/res/mipmap-xhdpi/ic_charge_diamond.png
Normal file
After Width: | Height: | Size: 2.4 KiB |
Before Width: | Height: | Size: 812 B |
@@ -582,11 +582,11 @@
|
||||
<!-- 弹窗取消按钮文字颜色 -->
|
||||
<color name="color_4C5AF1">#5FCCE4</color>
|
||||
<!-- 常用渐变按钮开始颜色 -->
|
||||
<color name="color_218eff">#5BC8F8</color>
|
||||
<color name="color_248cfe">#248CFE</color>
|
||||
<color name="color_218eff">#FFE710</color>
|
||||
<color name="color_248cfe">#FFE710</color>
|
||||
<!-- 常用渐变按钮结束颜色 -->
|
||||
<color name="color_7727e4">#66D9D9</color>
|
||||
<color name="color_5caaff">#5CAAFF</color>
|
||||
<color name="color_7727e4">#FFE710</color>
|
||||
<color name="color_5caaff">#FFE710</color>
|
||||
<!-- 首页tab未选中颜色 -->
|
||||
<color name="main_tab_normal">#BDBFD0</color>
|
||||
|
||||
|
@@ -113,7 +113,6 @@ public class AddBankCardAgreementActivity extends BaseMvpActivity<IAddBankCardAg
|
||||
super.setStatusBar();
|
||||
StatusBarUtil.transparencyBar(this);
|
||||
StatusBarUtil.StatusBarLightMode(this);
|
||||
StatusBarUtil.StatusBarLightMode(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@@ -115,7 +115,6 @@ public class BankCardBindActivity extends BaseMvpActivity<IBankCardView, BankCar
|
||||
super.setStatusBar();
|
||||
StatusBarUtil.transparencyBar(this);
|
||||
StatusBarUtil.StatusBarLightMode(this);
|
||||
StatusBarUtil.StatusBarLightMode(this);
|
||||
}
|
||||
|
||||
private void startCountDownTimer() {
|
||||
|
@@ -136,7 +136,6 @@ public class BankCardListActivity extends BaseMvpActivity<IBankCardView, BankCar
|
||||
super.setStatusBar();
|
||||
StatusBarUtil.transparencyBar(this);
|
||||
StatusBarUtil.StatusBarLightMode(this);
|
||||
StatusBarUtil.StatusBarLightMode(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@@ -121,7 +121,6 @@ public class BankCardListUnbindActivity extends BaseMvpActivity<IBankCardView, B
|
||||
super.setStatusBar();
|
||||
StatusBarUtil.transparencyBar(this);
|
||||
StatusBarUtil.StatusBarLightMode(this);
|
||||
StatusBarUtil.StatusBarLightMode(this);
|
||||
}
|
||||
|
||||
private void hideAddBankCardLayout() {
|
||||
|
@@ -114,7 +114,6 @@ public class AddLocalMusicListActivity extends BaseMvpActivity<IAddLocalMusicLis
|
||||
super.setStatusBar();
|
||||
StatusBarUtil.transparencyBar(this);
|
||||
StatusBarUtil.StatusBarLightMode(this);
|
||||
StatusBarUtil.StatusBarLightMode(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@@ -120,7 +120,6 @@ public class MusicListActivity extends BaseMvpActivity<IMusicListView, MusicList
|
||||
super.setStatusBar();
|
||||
StatusBarUtil.transparencyBar(this);
|
||||
StatusBarUtil.StatusBarLightMode(this);
|
||||
StatusBarUtil.StatusBarLightMode(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@@ -61,7 +61,6 @@ public class PublicChatHallAitFriendsActivity extends BaseBindingActivity<Activi
|
||||
super.setStatusBar();
|
||||
StatusBarUtil.transparencyBar(this);
|
||||
StatusBarUtil.StatusBarLightMode(this);
|
||||
StatusBarUtil.StatusBarLightMode(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@@ -62,7 +62,6 @@ public class PublicChatHallHomeActivity extends BaseBindingActivity<ActivityPubl
|
||||
super.setStatusBar();
|
||||
StatusBarUtil.transparencyBar(this);
|
||||
StatusBarUtil.StatusBarLightMode(this);
|
||||
StatusBarUtil.StatusBarLightMode(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@@ -55,7 +55,6 @@ public class PublicChatHallRelatedToMeActivity extends BaseBindingActivity<Activ
|
||||
super.setStatusBar();
|
||||
StatusBarUtil.transparencyBar(this);
|
||||
StatusBarUtil.StatusBarLightMode(this);
|
||||
StatusBarUtil.StatusBarLightMode(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
|