Skip to content

T
TangKuPos
Commit f4f5d62f authored by 姜敏's avatar 姜敏
Browse files
Options

更改线的粗细

parent 8f22044c
Hide whitespace changes
Inline Side-by-side
Showing with 131 additions and 110 deletions
app/src/main/java/com/xingdata/zzdpos/ui/vip/VipActivity.java
View file @ f4f5d62f
......@@ -52,8 +52,9 @@ public class VipActivity extends BaseActivity<VipPresenter, ActivityVipBinding>
@Override
public void addVipSus(Vip vip) {
// mPresenter.vipListFragment.updateVipSus(vip);
mPresenter.vipAddSucceedFragment.setmVip(vip);
start(mPresenter.vipAddSucceedFragment);
// mPresenter.vipAddSucceedFragment.setmVip(vip);
// start(mPresenter.vipAddSucceedFragment);
mPresenter.vipInfoEditFragment.addVipSus(vip);
}
@Override
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipAddSucceedFragment.java
View file @ f4f5d62f
......@@ -38,8 +38,7 @@ public class VipAddSucceedFragment extends BaseFragment<VipPresenter, FragmentVi
//继续添加
mViewBinding.vipAdd.setOnClickListener(view -> {
// mPresenter.vipInfoEditFragment.setVip(null);
popTo(new VipInfoEditFragment().getClass(),false);
// start(new VipInfoEditFragment());
startWithPop(new VipInfoEditFragment());
});
//充值
......@@ -49,12 +48,14 @@ public class VipAddSucceedFragment extends BaseFragment<VipPresenter, FragmentVi
});
mViewBinding.vipSure.setOnClickListener(view -> {
popTo(mPresenter.vipListFragment.getClass(),false);
mPresenter.vipListFragment.updateVipSus(null);
});
//返回强制出堆栈
mViewBinding.infoTitle.ivBack.setOnClickListener(view -> {
popTo(mPresenter.vipListFragment.getClass(),false);
});
}
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipExpenseListFragment.java
View file @ f4f5d62f
......@@ -100,7 +100,7 @@ public class VipExpenseListFragment extends BaseFragment<VipPresenter, FragmentV
vipRechargeAdapter.notifyDataSetChanged();
pageNumber = saleorderPager.getPageNumber() + 1;
}
if (saleorderPager.isLastPage()) {
if (saleorderPager.getPageNumber()!=1&&saleorderPager.isLastPage()) {
ToastUtils.showShort("没有更多数据");
}
mViewBinding.expenseCount.setText(saleorderPager.getTotalRow() + "");
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipInfoEditFragment.java
View file @ f4f5d62f
......@@ -39,6 +39,7 @@ public class VipInfoEditFragment extends BaseFragment<VipPresenter, FragmentVipI
private Vip vip;
private Byte vipTag;
private int vipDiscounts;
private Byte vipLeavle;
@Override
public int getLayoutId() {
......@@ -55,7 +56,13 @@ public class VipInfoEditFragment extends BaseFragment<VipPresenter, FragmentVipI
if (vip != null) {
mViewBinding.infoTitle.tvTitle.setText("修改会员");
mViewBinding.vipDiscounts.setText(vip.getVipLevelName() + vip.getVipDefDiscount() + "折");
mViewBinding.vipBirthday.setText(StringUtil.format(new Date(vip.getVipBirthday())));
String strDate=String.valueOf(vip.getVipBirthday());
if (strDate.length()==8){
mViewBinding.vipBirthday.setText(strDate.substring(0, 4)+"-"+strDate.substring(4, 6)+"-"+strDate.substring(6, 8));
}else {
mViewBinding.vipBirthday.setText(strDate);
}
mViewBinding.vipName.setText(vip.getVipName());
mViewBinding.vipPhone.setText(vip.getVipMobile() + "");
if (String.valueOf(vip.getVipTag()).equals("1")) {
......@@ -64,6 +71,7 @@ public class VipInfoEditFragment extends BaseFragment<VipPresenter, FragmentVipI
mViewBinding.vipDiscounts.setText(vip.getVipLevelName() + " " + ConvertUtil.discount(vip.getVipDefDiscount()) + "折");
}
mViewBinding.vipDiscounts.setEnabled(false);
mViewBinding.vipDiscounts.setBackgroundResource(R.color.white);
// ((CheckBox) mViewBinding.vipSuper).setChecked(mVip.getVipTag() == 1);
RadioButton radioButton = mViewBinding.vipSex.findViewWithTag(vip.getVipSex().toString());
if (radioButton != null) {
......@@ -76,6 +84,7 @@ public class VipInfoEditFragment extends BaseFragment<VipPresenter, FragmentVipI
vipDiscounts = mPresenter.levels.get(0).getVipDefDiscount();
mViewBinding.vipBirthday.setText(StringUtil.format(new Date(System.currentTimeMillis())));
((RadioButton) mViewBinding.vipSex.getChildAt(0)).setChecked(true);
vipLeavle=mPresenter.levels.get(0).getVipLevel();
}
mViewBinding.setOnClickListener(view -> {
......@@ -120,6 +129,8 @@ public class VipInfoEditFragment extends BaseFragment<VipPresenter, FragmentVipI
if (sexId != -1) {
mVip.setVipSex(Byte.parseByte(mViewBinding.vipSex.findViewById(sexId).getTag().toString()));
}
mVip.setVipBirthday(Integer.parseInt(mViewBinding.vipBirthday.getText().toString().replaceAll("-","")));
mVip.setVipLevel(vipLeavle);
mPresenter.addVip(mVip);
pop();
break;
......@@ -147,9 +158,11 @@ public class VipInfoEditFragment extends BaseFragment<VipPresenter, FragmentVipI
if (options1 == 0) {
mViewBinding.vipDiscounts.setText(mPresenter.levels.get(options1).getPickerViewText() + " " + ConvertUtil.discount(mPresenter.levels.get(options1).getVipDefDiscount()) + "折");
vipDiscounts = mPresenter.levels.get(options1).getVipDefDiscount();
vipLeavle = mPresenter.levels.get(options1).getVipLevel();
} else {
mViewBinding.vipDiscounts.setText(mPresenter.levels.get(mPresenter.levels.size() - 1).getVipLevelName() + " " + ConvertUtil.discount(mPresenter.levels.get(mPresenter.levels.size() - 1).getVipDefDiscount()) + "折");
mViewBinding.vipDiscounts.setText(mPresenter.levels.get(mPresenter.levels.size() -1).getVipLevelName() + " " + ConvertUtil.discount(mPresenter.levels.get(mPresenter.levels.size() - 1).getVipDefDiscount()) + "折");
vipDiscounts = mPresenter.levels.get(mPresenter.levels.size() - 1).getVipDefDiscount();
vipLeavle=mPresenter.levels.get(mPresenter.levels.size() - 2).getVipLevel();
}
vipTag = Byte.parseByte(options1 + "");
}
......@@ -185,8 +198,18 @@ public class VipInfoEditFragment extends BaseFragment<VipPresenter, FragmentVipI
@Override
public void onDateSet(DatePicker view, int year, int monthOfYear, int
dayOfMonth) {
int inM=monthOfYear+1;
String strMonth=String.valueOf(inM);
if (strMonth.length()<2){
strMonth="0"+strMonth;
}
String strDay=String.valueOf(dayOfMonth);
if (strDay.length()<2){
strDay="0"+strDay;
}
//因为monthOfYear会比实际月份少一月所以这边要加1
((TextView) btn).setText(year + "-" + (monthOfYear + 1) + "-" + dayOfMonth);
((TextView) btn).setText(year + "-" + strMonth+"-" + strDay);
}
}, year, month, day);
//弹出选择日期对话框
......@@ -198,4 +221,11 @@ public class VipInfoEditFragment extends BaseFragment<VipPresenter, FragmentVipI
return false;
}
public void addVipSus(Vip vip) {
mPresenter.vipAddSucceedFragment.setmVip(vip);
start(mPresenter.vipAddSucceedFragment);
}
}
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipRechargeFragment.java
View file @ f4f5d62f
......@@ -16,6 +16,7 @@ import android.view.View;
import android.view.ViewTreeObserver;
import android.widget.LinearLayout;
import android.widget.RadioButton;
import android.widget.RadioGroup;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.C;
......@@ -42,7 +43,7 @@ import java.util.List;
@SuppressLint("ValidFragment")
public class VipRechargeFragment extends BaseFragment<VipPresenter, FragmentVipRechargeBinding> {
private List<Mscard> mscards = new ArrayList<>();
private LinearLayout.LayoutParams layoutParams = null;
private RadioGroup.LayoutParams layoutParams = null;
private HashMap<String, Mscard> mscardHashMap = new HashMap<>();
private PayAdapter mPayAdapter;
private List<Pay> mPays = new ArrayList<>();
......@@ -54,6 +55,7 @@ public class VipRechargeFragment extends BaseFragment<VipPresenter, FragmentVipR
}
private Vip mVip;
private boolean isFocus = false;
@Override
public void initView() {
......@@ -87,6 +89,8 @@ public class VipRechargeFragment extends BaseFragment<VipPresenter, FragmentVipR
Mscard mscard = mscardHashMap.get(radioButton.getTag().toString());
setMoney(ConvertUtil.fenToYuan2(mscard.getCruleChargeAmt()), ConvertUtil.fenToYuan2(mscard.getCruleSendAmt()));
mViewBinding.stealMoney.setText("");
// mViewBinding.stealMoney.clearFocus();
// mViewBinding.stealMoney.setFocusable(true);
}
});
ViewTreeObserver observer = mViewBinding.payMoneyLayout.getViewTreeObserver();
......@@ -101,7 +105,7 @@ public class VipRechargeFragment extends BaseFragment<VipPresenter, FragmentVipR
mPresenter.initSettle();
}
});
if (mscards==null){
if (mscards == null) {
mPresenter.getMscardList(mVip.getVipId());
}
}
......@@ -124,8 +128,8 @@ public class VipRechargeFragment extends BaseFragment<VipPresenter, FragmentVipR
mscards.clear();
mscards.addAll(mscardPager.getList());
layoutParams = new LinearLayout.LayoutParams(inWight / 3, LinearLayout.LayoutParams.MATCH_PARENT, 1);
layoutParams.setMargins(0, 0, 20, 0);
layoutParams = new RadioGroup.LayoutParams(inWight / 4, LinearLayout.LayoutParams.MATCH_PARENT,1);
layoutParams.setMargins(3,10, 3, 10);
int mscardLength = 0;
if (mscards.size() <= 3) {
mscardLength = mscards.size();
......@@ -142,7 +146,7 @@ public class VipRechargeFragment extends BaseFragment<VipPresenter, FragmentVipR
if (mscards.size() != 0) {
mViewBinding.payMoneyLayout.setVisibility(View.VISIBLE);
}else {
} else {
mViewBinding.payMoneyLayout.setVisibility(View.GONE);
}
......@@ -156,7 +160,7 @@ public class VipRechargeFragment extends BaseFragment<VipPresenter, FragmentVipR
{
//如果点击输入框按钮都清空点击事件
if (b) {
mViewBinding.payMoneyLayout.clearCheck();
setRadioGroupEnable(true, mViewBinding.payMoneyLayout);
setMoney("0", "0");
}
});
......@@ -175,10 +179,17 @@ public class VipRechargeFragment extends BaseFragment<VipPresenter, FragmentVipR
@Override
public void afterTextChanged(Editable editable) {
if (!mViewBinding.stealMoney.hasFocus()){
if (mViewBinding.stealMoney.getText().length() != 0) {
setRadioGroupEnable(true, mViewBinding.payMoneyLayout);
}
if (mViewBinding.payMoneyLayout.getCheckedRadioButtonId() != -1) {
return;
}
if (!mViewBinding.stealMoney.hasFocus()) {
return;
}
if (mViewBinding.stealMoney.getText().length() == 0 ) {
if (mViewBinding.stealMoney.getText().length() == 0) {
setMoney("0", "0");
return;
}
......@@ -235,4 +246,17 @@ public class VipRechargeFragment extends BaseFragment<VipPresenter, FragmentVipR
}
/**
* 设置RadioGroup 内容是否可点击；
*
* @param isEnabled
* @param radioGroup
*/
private void setRadioGroupEnable(boolean isEnabled, RadioGroup radioGroup) {
radioGroup.clearCheck();
for (int i = 0; i < radioGroup.getChildCount(); i++) {
radioGroup.getChildAt(i).setEnabled(isEnabled);
}
}
}
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipRechargeListFragment.java
View file @ f4f5d62f
......@@ -102,9 +102,6 @@ public class VipRechargeListFragment extends BaseFragment<VipPresenter, Fragment
vipRechargeAdapter.notifyDataSetChanged();
pageNumber = rechargeOrderPager.getPageNumber() + 1;
}
if (rechargeOrderPager.isLastPage()){
ToastUtils.showShort("没有更多数据");
}
vipRechargeAdapter.setEnableLoadMore(!rechargeOrderPager.isLastPage());
vipRechargeAdapter.loadMoreComplete();
mViewBinding.rechargeRefresh.setRefreshing(false);
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipTruleListFragment.java
View file @ f4f5d62f
......@@ -96,7 +96,7 @@ public class VipTruleListFragment extends BaseFragment<VipPresenter, FragmentVip
// pageNumber = mscardPager.getPageNumber() + 1;
}
getMscardValid();
if (trulePager.isLastPage()) {
if (trulePager.getPageNumber()!=1&&trulePager.isLastPage()) {
ToastUtils.showShort("没有更多数据");
}
mViewBinding.mscardValid.setText(valid+ "");
......
app/src/main/res/layout/fragment_recharge_rule_list.xml
View file @ f4f5d62f
......@@ -27,12 +27,6 @@
<include layout="@layout/line_layout" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_margin_left"></View>
<include layout="@layout/line_layout" />
<LinearLayout
android:id="@+id/addVipLinearLayout"
android:layout_width="match_parent"
......
app/src/main/res/layout/fragment_user_info.xml
View file @ f4f5d62f
......@@ -17,11 +17,13 @@
<include
android:id="@+id/info_title"
layout="@layout/title_pop" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_margin_left"/>
<include layout="@layout/line_layout" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_margin"
android:background="@color/white"
android:orientation="horizontal">
......
app/src/main/res/layout/fragment_user_info_edit.xml
View file @ f4f5d62f
......@@ -18,6 +18,10 @@
android:id="@+id/info_title"
layout="@layout/title_pop" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_margin_left"></View>
<include layout="@layout/line_layout" />
<LinearLayout
......@@ -121,12 +125,12 @@
<include layout="@layout/line_layout" />
<TextView
android:layout_marginTop="@dimen/all_margin_left"
style="@style/textView_title"
android:textSize="@dimen/small_text_size"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="注：店员初始密码为000000" />
android:layout_marginTop="@dimen/all_margin_left"
android:text="注：店员初始密码为000000"
android:textSize="@dimen/small_text_size" />
<RelativeLayout
android:layout_width="match_parent"
......
app/src/main/res/layout/fragment_vip_add_succeed.xml
View file @ f4f5d62f
......@@ -56,7 +56,7 @@
<TextView
style="@style/default_blacktext_no_margin_smallstyle"
android:text="会员手机" />
android:text="会员姓名" />
<TextView
android:id="@+id/vip_name"
......@@ -137,6 +137,7 @@
<Button
android:id="@+id/vip_add"
android:visibility="gone"
style="@style/button_positive_white"
android:layout_alignParentBottom="true"
android:text="继续添加" />
......
app/src/main/res/layout/fragment_vip_info.xml
View file @ f4f5d62f
......@@ -29,21 +29,20 @@
android:layout_width="match_parent"
android:layout_height="72dp"
android:background="@color/white"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="@dimen/all_margin"
android:layout_marginLeft="@dimen/all_margin_left"
android:background="@mipmap/iv_vip" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:layout_marginLeft="@dimen/all_margin_left"
android:layout_marginTop="10dp"
android:layout_weight="1"
android:background="@color/white"
android:orientation="vertical">
......@@ -52,11 +51,11 @@
android:id="@+id/vipName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/black"
android:textSize="@dimen/detail_textview_size" />
style="@style/default_blacktext_bigstyle" />
<TextView
android:id="@+id/vipMoble"
style="@style/default_blacktext_nopadding_smallstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/black"
......@@ -184,7 +183,7 @@
<TextView
style="@style/default_blacktext_margin_16_sp_style"
android:layout_width="72dp"
android:layout_width="74dp"
android:text="级别：" />
<TextView
......@@ -206,7 +205,7 @@
<TextView
style="@style/default_blacktext_margin_16_sp_style"
android:layout_width="72dp"
android:layout_width="74dp"
android:text="性别：" />
<TextView
......@@ -228,8 +227,8 @@
<TextView
style="@style/default_blacktext_margin_16_sp_style"
android:layout_width="72dp"
android:text="生日：" />
android:layout_width="74dp"
android:text="年龄：" />
<TextView
android:id="@+id/vip_birthday"
......@@ -238,37 +237,6 @@
android:layout_height="wrap_content" />
</LinearLayout>
<include layout="@layout/line_layout_margin" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="@color/white"
android:orientation="horizontal">
<TextView
style="@style/default_blacktext_margin_16_sp_style"
android:layout_width="72dp"
android:text="地区：" />
</LinearLayout>
<include layout="@layout/line_layout_margin" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="@color/white"
android:orientation="horizontal">
<TextView
style="@style/default_blacktext_margin_16_sp_style"
android:layout_width="wrap_content"
android:text="详细地址：" />
</LinearLayout>
<include layout="@layout/line_layout" />
</LinearLayout>
......
app/src/main/res/layout/fragment_vip_info_edit.xml
View file @ f4f5d62f
......@@ -128,8 +128,8 @@
android:id="@+id/vip_sex"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/all_margin_left"
android:layout_gravity="center"
android:layout_marginLeft="@dimen/all_margin_left"
android:gravity="center_vertical"
android:orientation="horizontal">
......@@ -179,9 +179,9 @@
android:layout_width="match_parent"
android:layout_marginLeft="@dimen/sp_12"
android:layout_marginRight="100dp"
android:onClick="@{onClickListener}"
android:drawableRight="@mipmap/ic_expand"
android:gravity="center_vertical"
android:onClick="@{onClickListener}" />
android:gravity="center_vertical" />
</LinearLayout>
<include layout="@layout/line_layout"></include>
......@@ -195,26 +195,27 @@
<TextView
style="@style/default_blacktext_margin_16_sp_style"
android:layout_width="72dp"
android:layout_width="110dp"
android:layout_marginLeft="13dp"
android:text="年龄：" />
android:text="出生年月：" />
<!--<TextView-->
<!--android:id="@+id/vip_birthday"-->
<!--style="@style/default_blacktext_nopadding_smallstyle"-->
<!--android:layout_width="match_parent"-->
<!--android:layout_marginLeft="21dp"-->
<!--android:hint="请选择"-->
<!--android:onClick="@{onClickListener}"-->
<!--android:textSize="@dimen/all_body_size" />-->
<EditText
<!--android:id="@+id/vip_birthday"-->
<!--style="@style/default_blacktext_nopadding_smallstyle"-->
<!--android:layout_width="match_parent"-->
<!--android:layout_marginLeft="21dp"-->
<!--android:hint="请选择"-->
<!--android:onClick="@{onClickListener}"-->
<!--android:textSize="@dimen/all_body_size" />-->
<TextView
android:id="@+id/vip_birthday"
style="@style/all_edittext_14sp_style"
style="@style/default_blacktext_nopadding_smallstyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@null"
android:hint="请输入年龄" />
android:layout_marginLeft="@dimen/sp_12"
android:onClick="@{onClickListener}"
android:layout_marginRight="100dp"
android:drawableRight="@mipmap/ic_expand"
android:gravity="center_vertical" />
</LinearLayout>
<include layout="@layout/line_layout"></include>
......
app/src/main/res/layout/fragment_vip_level_edit.xml
View file @ f4f5d62f
......@@ -21,7 +21,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/all_margin_left"
android:layout_margin="12sp"
android:gravity="center_vertical"
android:orientation="horizontal">
......@@ -47,7 +47,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="48dp"
android:background="@color/white"
android:gravity="center_vertical"
android:orientation="horizontal">
......@@ -77,7 +77,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="48dp"
android:background="@color/white"
android:gravity="center_vertical"
android:orientation="horizontal">
......@@ -117,7 +117,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/all_margin_left"
android:layout_margin="12sp"
android:gravity="center_vertical"
android:orientation="horizontal">
......@@ -132,7 +132,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="48dp"
android:background="@color/white"
android:orientation="horizontal">
......@@ -166,7 +166,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="48dp"
android:background="@color/white"
android:gravity="center_vertical"
android:orientation="horizontal">
......
app/src/main/res/layout/fragment_vip_list.xml
View file @ f4f5d62f
......@@ -86,7 +86,6 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="1111"
android:textSize="22sp"
android:textStyle="bold" />
......@@ -97,7 +96,6 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="1111"
android:textSize="22sp"
android:textStyle="bold" />
</LinearLayout>
......
app/src/main/res/layout/fragment_vip_recharge.xml
View file @ f4f5d62f
......@@ -24,22 +24,22 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="72dp"
android:background="@color/white"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="@dimen/all_margin"
android:layout_marginLeft="@dimen/all_margin_left"
android:layout_marginRight="@dimen/all_margin_left"
android:background="@mipmap/iv_vip" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/all_margin"
android:layout_marginTop="@dimen/all_margin"
android:layout_weight="1"
android:background="@color/white"
android:orientation="vertical">
......@@ -55,7 +55,6 @@
style="@style/default_blacktext_nopadding_smallstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="0dp"
android:textColor="@color/black" />
</LinearLayout>
......
app/src/main/res/layout/fragment_vip_recharge_list.xml
View file @ f4f5d62f
......@@ -20,22 +20,22 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="72dp"
android:background="@color/white"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="@dimen/all_margin"
android:layout_marginLeft="@dimen/all_margin_left"
android:layout_marginRight="@dimen/all_margin_left"
android:background="@mipmap/iv_vip" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/all_margin"
android:layout_marginTop="@dimen/all_margin"
android:layout_weight="1"
android:background="@color/white"
android:orientation="vertical">
......@@ -65,7 +65,7 @@
android:text="@string/vip_info_discount" />
</LinearLayout>
<include layout="@layout/line_layout"/>
<include layout="@layout/line_layout" />
<LinearLayout
android:layout_width="match_parent"
......@@ -124,7 +124,7 @@
</LinearLayout>
</LinearLayout>
<include layout="@layout/line_layout"/>
<include layout="@layout/line_layout" />
<android.support.v4.widget.SwipeRefreshLayout
android:id="@+id/recharge_refresh"
......
app/src/main/res/layout/item_vip_expense_item.xml
View file @ f4f5d62f
......@@ -72,10 +72,11 @@
android:text="门店"
android:textColor="@color/black_likui"
android:textSize="@dimen/all_text_size_small_small" />
</LinearLayout>
</LinearLayout>
<include layout="@layout/line_layout" />
</LinearLayout>
......
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