Skip to content

T
TangKuPos
Commit 25f9a03f authored by 陈前's avatar 陈前
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents ce16b6fc 79a8a496
Hide whitespace changes
Inline Side-by-side
Showing with 193 additions and 66 deletions
app/src/main/java/com/xingdata/zzdpos/ui/marketing/integral/fragment/IntegralExchangeFragment.java
View file @ 25f9a03f
......@@ -30,7 +30,7 @@ public class IntegralExchangeFragment extends BaseFragment<IntegralPresenter,
@Override
public void initView() {
mViewBinding.icTitle.tvTitle.setText("积分规则");
mViewBinding.icTitle.tvTitle.setText("兑换积分规则");
mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/integral/fragment/IntegralGetFragment.java
View file @ 25f9a03f
......@@ -67,7 +67,7 @@ public class IntegralGetFragment extends BaseFragment<IntegralPresenter,
@Override
public void initView() {
mViewBinding.icTitle.tvTitle.setText("积分规则");
mViewBinding.icTitle.tvTitle.setText("获取积分规则");
mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/integral/fragment/IntegralIndexFragment.java
View file @ 25f9a03f
......@@ -22,7 +22,6 @@ import com.xingdata.zzdpos.ui.marketing.integral.adapter.IntegralAdapter;
import com.xingdata.zzdpos.ui.marketing.integral.adapter.IntegralExchangeAdapter;
import com.xingdata.zzdpos.util.OnClickListener;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.List;
......@@ -50,7 +49,7 @@ public class IntegralIndexFragment extends BaseFragment<IntegralPresenter,
@Override
public void initView() {
mViewBinding.icTitle.tvTitle.setText("积分规则");
mViewBinding.icTitle.tvTitle.setText("获取积分规则");
mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
......@@ -90,6 +89,7 @@ public class IntegralIndexFragment extends BaseFragment<IntegralPresenter,
case R.id.rb_get: {
mViewBinding.rbGet.getPaint().setFakeBoldText(true);
mViewBinding.rbExchange.getPaint().setFakeBoldText(false);
mViewBinding.icTitle.tvTitle.setText("获取积分规则");
showView(v.getId());
mPresenter.query(1, NORMAL_TYPE, null);
}
......@@ -97,6 +97,7 @@ public class IntegralIndexFragment extends BaseFragment<IntegralPresenter,
case R.id.rb_exchange: {
mViewBinding.rbGet.getPaint().setFakeBoldText(false);
mViewBinding.rbExchange.getPaint().setFakeBoldText(true);
mViewBinding.icTitle.tvTitle.setText("兑换积分规则");
showView(v.getId());
LoadingDialog loadingDialog = new LoadingDialog();
loadingDialog.show((BaseActivity) getActivity());
......
app/src/main/java/com/xingdata/zzdpos/ui/sendticke/SendTicketContract.java
View file @ 25f9a03f
......@@ -19,6 +19,7 @@ public interface SendTicketContract {
void error(String errorMsg, LoadingDialog loadingDialog);
/**
*
* 加载会员列表
*
* @param vips 会员列表
......
app/src/main/java/com/xingdata/zzdpos/ui/settle/SettleActivity.java
View file @ 25f9a03f
......@@ -136,6 +136,12 @@ public class SettleActivity extends BaseActivity<SettlePresenter, ActivitySettle
this.start(mCashPayFragment.setSaleorder(saleorder));
break;
case C.PAY_CHANNEL.TALLY:
mScanFragment.setOnScanCompletedListener(barcode -> {
this.pop();
mPresenter.payInAli(barcode);
});
this.start(mScanFragment);
break;
case C.PAY_CHANNEL.CARD:
mPasswordDialog.setSaleorder(saleorder).show(this);
break;
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/VipActivity.java
View file @ 25f9a03f
......@@ -50,7 +50,13 @@ public class VipActivity extends BaseActivity<VipPresenter, ActivityVipBinding>
@Override
public void addVipSus(Vip vip) {
mPresenter.vipListFragment.updateVipSus(vip);
}
@Override
public void updateVipSus(Vip vip) {
mPresenter.vipInfoFragment.addVipSus(vip);
}
@Override
......@@ -109,7 +115,6 @@ public class VipActivity extends BaseActivity<VipPresenter, ActivityVipBinding>
}
@Override
public void getVipLevelSus(Pager<Level> levelPager) {
mPresenter.vipListFragment.getVipLevelSus(levelPager);
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/VipContract.java
View file @ 25f9a03f
......@@ -29,6 +29,8 @@ public interface VipContract {
void addVipSus(Vip vip);
void updateVipSus(Vip vip);
void ticketQuerySus(List<Ticket> ticketPager);
void getSaleorderSus(Pager<Saleorder> saleorderPager);
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/VipPresenter.java
View file @ 25f9a03f
......@@ -86,7 +86,7 @@ public class VipPresenter extends VipContract.Presenter {
});
} else {
ApiFactory.User.updateVip(vip).subscribe(mVip -> {
mView.addVipSus(mVip);
mView.updateVipSus(mVip);
}, throwable -> {
ToastUtils.showShort(throwable.getMessage());
});
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipInfoEditFragment.java
View file @ 25f9a03f
......@@ -26,6 +26,7 @@ import com.xingdata.zzdpos.ui.vip.dialog.VipEditMenuDialog;
import com.xingdata.zzdpos.util.ConvertUtil;
import com.xingdata.zzdpos.util.StringUtil;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
......@@ -33,9 +34,11 @@ import java.util.List;
/**
* 会员信息界面
*/
public class VipInfoEditFragment extends BaseFragment<VipPresenter, FragmentVipInfoEditBinding> {
public class VipInfoEditFragment extends BaseFragment<VipPresenter, FragmentVipInfoEditBinding> {
private List<Level> levels;
private ArrayList<Level> mLevels = new ArrayList<>();
private Vip mVip;
private Byte vipTag;
@Override
public int getLayoutId() {
......@@ -51,18 +54,22 @@ public class VipInfoEditFragment extends BaseFragment<VipPresenter, FragmentVipI
mViewBinding.vipBirthday.setText(StringUtil.format(new Date(mVip.getVipBirthday())));
mViewBinding.vipName.setText(mVip.getVipName());
mViewBinding.vipPhone.setText(mVip.getVipMobile() + "");
((CheckBox) mViewBinding.vipSuper).setChecked(mVip.getVipTag() == 1);
if (String.valueOf(mVip.getVipTag()).equals("1")) {
mViewBinding.vipDiscounts.setText("超级会员"+ " " + ConvertUtil.discount(mVip.getVipDefDiscount()) + "折");
} else {
mViewBinding.vipDiscounts.setText(mVip.getVipLevelName() + " " + ConvertUtil.discount(mVip.getVipDefDiscount()) + "折");
}
mViewBinding.vipDiscounts.setEnabled(false);
// ((CheckBox) mViewBinding.vipSuper).setChecked(mVip.getVipTag() == 1);
RadioButton radioButton = mViewBinding.vipSex.findViewWithTag(mVip.getVipSex().toString());
if (radioButton != null) {
radioButton.setChecked(true);
}
} else {
mViewBinding.infoTitle.tvTitle.setText("添加会员");
}
if (levels!=null&&levels.size() != 0) {
mViewBinding.vipDiscounts.setEnabled(true);
mViewBinding.vipDiscounts.setText(levels.get(0).getVipLevelName() + " " + ConvertUtil.discount(levels.get(0).getVipDefDiscount()) + "折");
}
mViewBinding.setOnClickListener(view -> {
switch (view.getId()) {
case R.id.vip_discounts:
......@@ -74,11 +81,11 @@ public class VipInfoEditFragment extends BaseFragment<VipPresenter, FragmentVipI
break;
case R.id.onSure:
if (mViewBinding.vipName.getText().length()==0){
if (mViewBinding.vipName.getText().length() == 0) {
ToastUtils.showShort("会员名称不能为空");
return;
}
if (mViewBinding.vipPhone.getText().length()==0){
if (mViewBinding.vipPhone.getText().length() == 0) {
ToastUtils.showShort("会员手机号不能为空");
return;
}
......@@ -89,15 +96,18 @@ public class VipInfoEditFragment extends BaseFragment<VipPresenter, FragmentVipI
}
mVip.setVipName(mViewBinding.vipName.getText().toString().trim());
mVip.setVipMobile(Long.parseLong(mViewBinding.vipPhone.getText().toString().trim()));
if (vipTag != null) {
mVip.setVipTag(vipTag);
mVip.setVipLevelName("超级会员");
} else {
mVip.setVipTag(Byte.parseByte("0"));
}
int sexId = mViewBinding.vipSex.getCheckedRadioButtonId();
if (sexId != -1) {
mVip.setVipSex(Byte.parseByte(mViewBinding.vipSex.findViewById(sexId).getTag().toString()));
}
if (mVip.getVipId() != null) {
mPresenter.addVip(mVip);
} else {
mPresenter.addVip(mVip);
}
mPresenter.addVip(mVip);
break;
}
});
......@@ -121,9 +131,8 @@ public class VipInfoEditFragment extends BaseFragment<VipPresenter, FragmentVipI
@Override
public void onOptionsSelect(int options1, int options2, int options3, View v) {
String tx = levels.get(options1).getPickerViewText();
mViewBinding.vipDiscounts.setText(tx + " " + ConvertUtil.discount(levels.get(options1).getVipDefDiscount()) + "折");
// mViewBinding.tvSelectStore.setText(tx);
// shops = list.get(options1);
mViewBinding.vipDiscounts.setText(tx + " " + ConvertUtil.discount(levels.get(options1 - 1).getVipDefDiscount()) + "折");
vipTag = Byte.parseByte(options1 + "");
}
}).setTitleText("请选择")
.setDividerColor(Color.BLACK)
......@@ -131,12 +140,16 @@ public class VipInfoEditFragment extends BaseFragment<VipPresenter, FragmentVipI
.setContentTextSize(20)
.build();
pvOptions.setPicker(levels);
pvOptions.setPicker(mLevels);
pvOptions.show();
}
public void setVipLevel(List<Level> levels) {
this.levels = levels;
mLevels.clear();
mLevels.add(levels.get(0));
mLevels.add(levels.get(levels.size() - 1));
mLevels.get(mLevels.size() - 1).setVipLevelName("超级会员");
}
public void setVip(Vip mVip) {
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipInfoFragment.java
View file @ 25f9a03f
......@@ -9,6 +9,8 @@ import com.xingdata.zzdpos.model.Ticket;
import com.xingdata.zzdpos.model.Vip;
import com.xingdata.zzdpos.ui.vip.VipPresenter;
import com.xingdata.zzdpos.ui.vip.dialog.VipEditMenuDialog;
import com.xingdata.zzdpos.util.ConvertUtil;
import com.xingdata.zzdpos.util.StringUtil;
import java.util.List;
......@@ -16,7 +18,7 @@ import java.util.List;
* Created by JM_DEV on 2018/1/4.
*/
public class VipInfoFragment extends BaseFragment<VipPresenter, FragmentVipInfoBinding> {
public class VipInfoFragment extends BaseFragment<VipPresenter, FragmentVipInfoBinding> {
private Vip mVip;
private List<Level> level;
......@@ -38,16 +40,20 @@ public class VipInfoFragment extends BaseFragment<VipPresenter, FragmentVipInfoB
dialog.setVip(mVip);
dialog.show((BaseActivity) getActivity());
});
if (mVip!=null){
if (mVip != null) {
mViewBinding.Totalpamt.setText(String.valueOf(mVip.getVipTotalpamt()));
mViewBinding.BoundCbal.setText(String.valueOf(mVip.getBoundCbal()));
mViewBinding.AcctCbal.setText(String.valueOf(mVip.getAcctCbal()));
mViewBinding.vipLevel.setText(mVip.getVipLevelName());
if (String.valueOf(mVip.getVipTag()).equals("1")){
mViewBinding.vipLevel.setText("超级会员");
}else {
mViewBinding.vipLevel.setText(mVip.getVipLevelName());
}
mViewBinding.vipBirthday.setText(mVip.getVipBirthday() + "");
mViewBinding.vipName.setText(mVip.getVipName());
mViewBinding.vipMoble.setText(mVip.getVipMobile() + "");
mViewBinding.vipSex.setText(getVipSex(mVip.getVipSex()));
mViewBinding.vipDiscounts.setText(getString(R.string.vip_discount, mVip.getVipDefDiscount() + ""));
mViewBinding.vipDiscounts.setText(getString(R.string.vip_discount, ConvertUtil.discount(mVip.getVipDefDiscount() )+ ""));
mPresenter.ticketQuery(mVip.getVipId());
}
......@@ -72,9 +78,24 @@ public class VipInfoFragment extends BaseFragment<VipPresenter, FragmentVipInfoB
public void addVipSus(Vip vip) {
mVip = vip;
initView();
mPresenter.vipInfoEditFragment.pop();
mViewBinding.Totalpamt.setText(String.valueOf(vip.getVipTotalpamt()));
mViewBinding.BoundCbal.setText(String.valueOf(vip.getBoundCbal()));
mViewBinding.AcctCbal.setText(String.valueOf(vip.getAcctCbal()));
if (String.valueOf(vip.getVipTag()).equals("1")){
mViewBinding.vipLevel.setText("超级会员");
}else {
mViewBinding.vipLevel.setText(vip.getVipLevelName());
}
mViewBinding.vipBirthday.setText(vip.getVipBirthday() + "");
mViewBinding.vipName.setText(vip.getVipName());
mViewBinding.vipMoble.setText(vip.getVipMobile() + "");
mViewBinding.vipSex.setText(getVipSex(vip.getVipSex()));
mViewBinding.vipDiscounts.setText(getString(R.string.vip_discount, vip.getVipDefDiscount() + ""));
mPresenter.ticketQuery(vip.getVipId());
// initView();
}
public void ticketQuerySus(List<Ticket> ticketPager) {
mViewBinding.ticketCount.setText(String.valueOf(ticketPager.size()));
}
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipListFragment.java
View file @ 25f9a03f
......@@ -104,7 +104,6 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
case R.id.onScan:
ToastUtils.showShort("aaaaaaaaaaaa");
PermissionUtils.permission(PermissionConstants.CAMERA).callback(new PermissionUtils.FullCallback() {
@Override
public void onGranted(List<String> permissionsGranted) {
......@@ -170,6 +169,9 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
public void getVipLevelSus(Pager<Level> levelPager) {
if ( mViewBinding.vipLevelR.getChildCount()!=0){
mViewBinding.vipLevelR.removeAllViews();
}
LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT);
Level allLevel = new Level();
allLevel.setVipLevelName("全部会员");
......@@ -192,6 +194,9 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
}
levels = levelPager.getList();
Level level = new Level();
level.setVipLevelName("超级会员");
levels.add(level);
}
private void onLoadMore() {
......@@ -231,19 +236,17 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
mPresenter.vipInfoFragment.setLevel(levels);
((BaseActivity) getActivity()).start(mPresenter.vipInfoFragment);
} else {
mPresenter.vipInfoFragment.setVip(vip);
((BaseActivity) getActivity()).start(mPresenter.vipRechargeFragment);
}
} else {
mPresenter.vipInfoEditFragment.setVip(null);
mPresenter.vipInfoEditFragment.setVipLevel(levels);
((BaseActivity) getActivity()).start(mPresenter.vipInfoEditFragment);
}
}
public void addVipSus(Vip vip) {
}
/**
* @param sta
*/
......@@ -258,6 +261,12 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
}
public void updateVipSus(Vip vip) {
pageNumber = 0;
mPresenter.getVipLevel(pageNumber, 200);
mPresenter.getVipNumber();
mPresenter.vipInfoEditFragment.pop();
}
public void setVipState(int vipState) {
this.vipState = vipState;
......
app/src/main/res/drawable/up_down_line_gray_bottom.xml 0 → 100644
View file @ 25f9a03f
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:left="-2dp"
android:right="-2dp"
android:top="-2dp">
<shape>
<solid android:color="@color/gray_zhouyu"/>
<stroke
android:width="0.5dp"
android:color="@color/gray_huanggai"/>
</shape>
</item>
</layer-list>
\ No newline at end of file
app/src/main/res/drawable/up_down_line_gray_top.xml 0 → 100644
View file @ 25f9a03f
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:left="-2dp"
android:bottom="-2dp"
android:right="-2dp">
<shape>
<solid android:color="@color/gray_zhouyu"/>
<stroke
android:width="0.5dp"
android:color="@color/gray_huanggai"/>
</shape>
</item>
</layer-list>
\ No newline at end of file
app/src/main/res/drawable/up_down_line_white_bottom.xml 0 → 100644
View file @ 25f9a03f
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:left="-2dp"
android:top="-2dp"
android:right="-2dp">
<shape>
<solid android:color="@android:color/white"/>
<stroke
android:width="0.5dp"
android:color="@color/gray_huanggai"/>
</shape>
</item>
</layer-list>
\ No newline at end of file
app/src/main/res/drawable/up_down_line_white_top.xml 0 → 100644
View file @ 25f9a03f
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:left="-2dp"
android:bottom="-2dp"
android:right="-2dp">
<shape>
<solid android:color="@android:color/white"/>
<stroke
android:width="0.5dp"
android:color="@color/gray_huanggai"/>
</shape>
</item>
</layer-list>
\ No newline at end of file
app/src/main/res/layout/dialog_integral_exchange_setting.xml
View file @ 25f9a03f
......@@ -27,7 +27,7 @@
<TextView
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/gray_zhouyu"
android:background="@drawable/up_down_line_gray"
android:gravity="left|center_vertical"
android:paddingLeft="@dimen/all_padding"
android:text="基本信息"
......@@ -45,6 +45,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:minHeight="@dimen/list1_height"
android:gravity="center"
android:paddingBottom="@dimen/all_padding"
android:paddingTop="@dimen/all_padding">
......@@ -156,7 +157,7 @@
<TextView
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/gray_zhouyu"
android:background="@drawable/up_down_line_gray"
android:gravity="left|center_vertical"
android:paddingLeft="@dimen/all_padding"
android:text="兑换条件"
......@@ -209,9 +210,9 @@
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_marginLeft="@dimen/all_padding"
android:layout_marginRight="@dimen/all_padding"
android:background="@color/gray1"></View>
android:layout_marginLeft="@dimen/all_bounced_spacing"
android:layout_marginRight="@dimen/all_bounced_spacing"
android:background="@color/gray_huanggai"></View>
<LinearLayout
android:layout_width="match_parent"
......
app/src/main/res/layout/dialog_integral_get_setting.xml
View file @ 25f9a03f
......@@ -47,30 +47,21 @@
android:orientation="vertical">
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:background="@color/gray_huanggai"></View>
<TextView
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/gray_zhouyu"
android:background="@drawable/up_down_line_gray"
android:gravity="left|center_vertical"
android:paddingLeft="@dimen/all_bounced_padding"
android:text="基本信息"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/text_secondary_title"/>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:background="@color/gray_huanggai"></View>
<LinearLayout
android:id="@+id/ll_rules_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="@dimen/list1_height"
android:background="@color/white"
android:gravity="center"
android:paddingBottom="@dimen/all_padding"
......@@ -109,7 +100,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="@dimen/list1_height"
android:background="@color/white"
android:gravity="center"
android:paddingBottom="@dimen/all_padding"
......@@ -188,6 +179,7 @@
android:layout_height="wrap_content"
android:background="@color/white"
android:gravity="center"
android:minHeight="@dimen/list1_height"
android:paddingBottom="@dimen/all_padding"
android:paddingTop="@dimen/all_padding">
......@@ -237,12 +229,19 @@
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_marginLeft="@dimen/all_bounced_spacing"
android:layout_marginRight="@dimen/all_bounced_spacing"
android:background="@color/gray_huanggai"></View>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/up_down_line_white"
android:background="@color/white"
android:gravity="center"
android:minHeight="@dimen/list1_height"
android:paddingBottom="@dimen/all_padding"
android:paddingTop="@dimen/all_padding">
......@@ -250,6 +249,8 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:drawableLeft="@mipmap/point"
android:drawablePadding="@dimen/all_bounced_spacing"
android:paddingLeft="@dimen/all_bounced_padding"
android:text="获取方式:"
android:textColor="@color/black"
......@@ -322,6 +323,12 @@
android:visibility="gone"/>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/view_line_height"
android:layout_marginLeft="@dimen/all_bounced_spacing"
android:layout_marginRight="@dimen/all_bounced_spacing"
android:background="@color/gray_huanggai"></View>
<LinearLayout
android:id="@+id/ll_all"
......@@ -434,7 +441,7 @@
android:id="@+id/ll_category"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/up_down_line_white"
android:background="@drawable/up_down_line_white_bottom"
android:gravity="center"
android:orientation="vertical"
android:visibility="gone">
......@@ -443,6 +450,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:minHeight="@dimen/list1_height"
android:orientation="horizontal"
android:paddingBottom="@dimen/all_padding"
android:paddingTop="@dimen/all_padding">
......@@ -542,6 +550,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:minHeight="@dimen/list1_height"
android:orientation="horizontal"
android:paddingBottom="@dimen/all_padding"
android:paddingTop="@dimen/all_padding">
......@@ -593,6 +602,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:minHeight="@dimen/list1_height"
android:orientation="horizontal"
android:paddingBottom="@dimen/all_padding"
android:paddingTop="@dimen/all_padding"
......@@ -641,6 +651,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:minHeight="@dimen/list1_height"
android:orientation="horizontal"
android:paddingBottom="@dimen/all_padding"
android:paddingTop="@dimen/all_padding"
......
app/src/main/res/layout/dialog_prompt.xml
View file @ 25f9a03f
......@@ -33,6 +33,7 @@
android:paddingBottom="@dimen/all_padding"
android:textSize="@dimen/text_three_title"
android:paddingTop="@dimen/all_padding"
android:background="@drawable/up_down_line_white"
android:text="系统提示"
android:textColor="@color/black_baozheng"/>
......
app/src/main/res/layout/fragment_integral_main.xml
View file @ 25f9a03f
......@@ -64,7 +64,7 @@
<RadioGroup
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/up_down_line_white"
android:background="@drawable/up_down_line_white_bottom"
android:checkedButton="@id/rb_get"
android:gravity="center"
android:orientation="horizontal">
......
app/src/main/res/layout/fragment_vip_info_edit.xml
View file @ 25f9a03f
......@@ -79,6 +79,7 @@
android:digits="0123456789"
android:inputType="phone"
style="@style/dialog_edit"
android:maxLength="11"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
......@@ -162,23 +163,14 @@
android:text="级别" />
<TextView
android:gravity="center"
android:id="@+id/vip_discounts"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/sp_12"
android:layout_marginRight="@dimen/all_margin_left"
android:drawableRight="@mipmap/ic_expand"
android:onClick="@{onClickListener}" />
<CheckBox
android:id="@+id/vip_super"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="50dp"
android:layout_marginRight="50dp"
android:layout_weight="1"
android:background="@drawable/selector_checkbox_bg"
android:button="@null"
android:text="超级VIP" />
</LinearLayout>
<View
......
app/src/main/res/values/dimens.xml
View file @ 25f9a03f
......@@ -69,7 +69,7 @@
<dimen name="dialog_button_width">190dp</dimen>
<!--提示对话框-->
<dimen name="prompt_dialog_width">300dp</dimen>
<dimen name="prompt_dialog_height">200dp</dimen>
<dimen name="prompt_dialog_height">220dp</dimen>
<dimen name="prompt_dialog_logo_size">48dp</dimen>
<!--商品页面-->
<integer name="fragment_store_product_item_span_count">4</integer>
......
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