Skip to content

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

修改Radiobutton间距

parent 79a8a496
Hide whitespace changes
Inline Side-by-side
Showing with 118 additions and 76 deletions
.idea/modules.xml
View file @ e999ade9
......@@ -2,7 +2,8 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/TangKuPos.iml" filepath="$PROJECT_DIR$/TangKuPos.iml" />
<module fileurl="file://C:\Users\JM_DEV\AndroidStudioProjects\TangKuPos2\TangKuPos.iml" filepath="C:\Users\JM_DEV\AndroidStudioProjects\TangKuPos2\TangKuPos.iml" />
<module fileurl="file://$PROJECT_DIR$/TangKuPos2.iml" filepath="$PROJECT_DIR$/TangKuPos2.iml" />
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
</modules>
</component>
......
app/src/main/java/com/xingdata/zzdpos/ui/settle/SettleActivity.java
View file @ e999ade9
......@@ -136,18 +136,16 @@ 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;
case C.PAY_CHANNEL.BANK:
case C.PAY_CHANNEL.ALI:
showMsg("暂时无法使用");
mScanFragment.setOnScanCompletedListener(barcode -> {
this.pop();
mPresenter.payInAli(barcode);
});
this.start(mScanFragment);
break;
case C.PAY_CHANNEL.WECHAT:
mScanFragment.setOnScanCompletedListener(barcode -> {
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipInfoEditFragment.java
View file @ e999ade9
......@@ -69,7 +69,10 @@ public class VipInfoEditFragment extends BaseFragment<VipPresenter, FragmentVipI
mViewBinding.infoTitle.tvTitle.setText("添加会员");
mViewBinding.vipDiscounts.setEnabled(true);
mViewBinding.vipDiscounts.setText(levels.get(0).getVipLevelName() + " " + ConvertUtil.discount(levels.get(0).getVipDefDiscount()) + "折");
mViewBinding.vipBirthday.setText(StringUtil.format(new Date(System.currentTimeMillis())));
((RadioButton) mViewBinding.vipSex.getChildAt(0)).setChecked(true);
}
mViewBinding.setOnClickListener(view -> {
switch (view.getId()) {
case R.id.vip_discounts:
......@@ -89,7 +92,10 @@ public class VipInfoEditFragment extends BaseFragment<VipPresenter, FragmentVipI
ToastUtils.showShort("会员手机号不能为空");
return;
}
if (mViewBinding.vipPhone.getText().length() != 11) {
ToastUtils.showShort("手机号长度必须为11位");
return;
}
if (mVip == null) {
mVip = new Vip();
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipInfoFragment.java
View file @ e999ade9
......@@ -41,9 +41,9 @@ public class VipInfoFragment extends BaseFragment<VipPresenter, FragmentVipInfoB
dialog.show((BaseActivity) getActivity());
});
if (mVip != null) {
mViewBinding.Totalpamt.setText(String.valueOf(mVip.getVipTotalpamt()));
mViewBinding.Totalpamt.setText(ConvertUtil.fenToYuanNoZero(mVip.getVipTotalpamt()));
mViewBinding.BoundCbal.setText(String.valueOf(mVip.getBoundCbal()));
mViewBinding.AcctCbal.setText(String.valueOf(mVip.getAcctCbal()));
mViewBinding.AcctCbal.setText(ConvertUtil.fenToYuanNoZero(mVip.getAcctCbal()));
if (String.valueOf(mVip.getVipTag()).equals("1")){
mViewBinding.vipLevel.setText("超级会员");
}else {
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipRechargeListFragment.java
View file @ e999ade9
......@@ -38,11 +38,6 @@ public class VipRechargeListFragment extends BaseFragment<VipPresenter, Fragment
private List<VipRechargeOrder> orders = new ArrayList<>();
private int pageNumber = 0;
private List<Level> levels;
private LinearLayout.LayoutParams layoutParams = null;
private HashMap<String, Mscard> mscardHashMap = new HashMap<>();
private ArrayList<Mscard> mscards = new ArrayList<>();
private ArrayList<String> strLevels = new ArrayList<>();
private EditText serchEditText;
@Override
......@@ -59,7 +54,8 @@ public class VipRechargeListFragment extends BaseFragment<VipPresenter, Fragment
mViewBinding.rechargeRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
mViewBinding.rechargeRecyclerView.setAdapter(vipRechargeAdapter);
mViewBinding.rechargeRefresh.setOnRefreshListener(this::onRefresh);
mViewBinding.rechargeAMT.setText(ConvertUtil.fenToYuan2(mVip.getVipTotalpamt()));
mViewBinding.rechargeAmt.setText(ConvertUtil.fenToYuan2(mVip.getAcctCbal()));
mViewBinding.balanceAMT.setText(ConvertUtil.fenToYuan2(mVip.getAcctCbal()));
mViewBinding.vipMobile.setText(String.valueOf(mVip.getVipMobile()));
mViewBinding.vipName.setText(String.valueOf(mVip.getVipName()));
mViewBinding.infoTitle.popMenu.setVisibility(View.GONE);
......
app/src/main/res/layout/fragment_recharge_rule_edit.xml
View file @ e999ade9
......@@ -283,15 +283,15 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/all_margin_left"
android:layout_marginRight="@dimen/all_margin_left"
android:orientation="horizontal">
<Button
android:id="@+id/onSure"
style="@style/button_positive_noradius"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginBottom="15dp"
android:onClick="@{onClickListener}"
android:text="确认" />
</RelativeLayout>
......
app/src/main/res/layout/fragment_vip_info.xml
View file @ e999ade9
......@@ -21,7 +21,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="72dp"
android:layout_marginTop="@dimen/all_margin"
android:background="@color/white"
android:orientation="horizontal">
......@@ -36,9 +36,9 @@
<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_marginBottom="10dp"
android:layout_weight="1"
android:background="@color/white"
android:orientation="vertical">
......@@ -180,14 +180,14 @@
android:orientation="horizontal">
<TextView
style="@style/default_blacktext_margin_smallstyle"
style="@style/default_blacktext_margin_16_sp_style"
android:layout_width="70dp"
android:layout_height="wrap_content"
android:text="级别" />
<TextView
android:id="@+id/vipLevel"
style="@style/default_blacktext_margin_smallstyle"
style="@style/default_blacktext_nopadding_smallstyle"
android:textSize="@dimen/all_text_size"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
......@@ -206,17 +206,16 @@
android:orientation="horizontal">
<TextView
style="@style/default_blacktext_margin_smallstyle"
style="@style/default_blacktext_margin_16_sp_style"
android:layout_width="70dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin_left"
android:text="性别" />
<TextView
android:id="@+id/vipSex"
style="@style/default_blacktext_margin_smallstyle"
style="@style/default_blacktext_nopadding_smallstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/all_text_size"
/>
</LinearLayout>
......@@ -235,14 +234,13 @@
android:orientation="horizontal">
<TextView
style="@style/default_blacktext_margin_smallstyle"
style="@style/default_blacktext_margin_16_sp_style"
android:layout_width="70dp"
android:layout_height="wrap_content"
android:text="生日" />
<TextView
android:id="@+id/vip_birthday"
style="@style/default_blacktext_margin_smallstyle"
style="@style/default_blacktext_nopadding_smallstyle"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
......@@ -261,9 +259,8 @@
android:orientation="horizontal">
<TextView
style="@style/default_blacktext_margin_smallstyle"
style="@style/default_blacktext_margin_16_sp_style"
android:layout_width="70dp"
android:layout_height="wrap_content"
android:text="地区" />
</LinearLayout>
......@@ -280,9 +277,8 @@
android:orientation="horizontal">
<TextView
style="@style/default_blacktext_margin_smallstyle"
style="@style/default_blacktext_margin_16_sp_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="详细地址" />
</LinearLayout>
......
app/src/main/res/layout/fragment_vip_info_edit.xml
View file @ e999ade9
......@@ -35,18 +35,23 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
style="@style/default_blacktext_margin_smallstyle"
android:layout_width="70dp"
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin_left"
android:background="@mipmap/point" />
<TextView
style="@style/default_blacktext_nopadding_smallstyle"
android:layout_width="70dp"
android:text="姓名" />
<EditText
android:id="@+id/vip_name"
style="@style/dialog_edit"
style="@style/all_edittext_14sp_style"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
......@@ -64,36 +69,41 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
style="@style/default_blacktext_margin_smallstyle"
android:layout_width="70dp"
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin_left"
android:background="@mipmap/point" />
<TextView
style="@style/default_blacktext_nopadding_smallstyle"
android:layout_width="70dp"
android:maxLength="11"
android:text="手机号" />
<EditText
android:id="@+id/vip_phone"
android:digits="0123456789"
android:inputType="phone"
style="@style/dialog_edit"
android:maxLength="11"
style="@style/all_edittext_14sp_style"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
android:hint="请输入手机号" />
android:digits="0123456789"
android:hint="请输入手机号"
android:inputType="phone"
android:maxLength="11" />
</LinearLayout>
</LinearLayout>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/all_margin"
android:layout_gravity="center_vertical"
android:background="@mipmap/camera" />
android:background="@mipmap/hd_default02" />
</LinearLayout>
<View
......@@ -108,33 +118,41 @@
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/all_margin_left"
android:layout_marginLeft="@dimen/all_margin_left"
android:layout_marginTop="@dimen/all_margin_left"
android:background="@mipmap/point" />
<TextView
style="@style/default_blacktext_margin_smallstyle"
style="@style/default_blacktext_nopadding_smallstyle"
android:layout_width="70dp"
android:layout_height="wrap_content"
android:text="性别" />
<RadioGroup
android:gravity="center_vertical"
android:id="@+id/vip_sex"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="12sp"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/all_margin_left"
android:layout_marginRight="100dp"
android:orientation="horizontal">
<RadioButton
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginRight="50dp"
android:layout_weight="1"
android:background="@drawable/selector_checkbox_bg"
android:button="@null"
android:tag="1"
android:layout_marginRight="@dimen/all_margin_left"
android:text="男" />
<RadioButton
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginRight="50dp"
android:layout_weight="1"
android:background="@drawable/selector_checkbox_bg"
android:button="@null"
......@@ -152,23 +170,28 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:background="@color/white"
android:orientation="horizontal">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin_left"
android:background="@mipmap/point" />
<TextView
style="@style/default_blacktext_margin_smallstyle"
style="@style/default_blacktext_nopadding_smallstyle"
android:layout_width="70dp"
android:layout_height="wrap_content"
android:text="级别" />
<TextView
android:gravity="center"
style="@style/default_blacktext_nopadding_smallstyle"
android:id="@+id/vip_discounts"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/sp_12"
android:layout_marginRight="@dimen/all_margin_left"
android:gravity="center_vertical"
android:layout_marginRight="100dp"
android:drawableRight="@mipmap/ic_expand"
android:onClick="@{onClickListener}" />
</LinearLayout>
......@@ -186,17 +209,18 @@
android:orientation="horizontal">
<TextView
style="@style/default_blacktext_margin_smallstyle"
style="@style/default_blacktext_margin_16_sp_style"
android:layout_width="70dp"
android:layout_height="wrap_content"
android:layout_marginLeft="13dp"
android:text="生日" />
<TextView
android:id="@+id/vip_birthday"
style="@style/default_blacktext_smallstyle"
style="@style/default_blacktext_nopadding_smallstyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="请选择"
android:layout_marginLeft="21dp"
android:textSize="@dimen/all_body_size"
android:onClick="@{onClickListener}" />
</LinearLayout>
......@@ -204,18 +228,19 @@
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/line_bg" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_marginLeft="@dimen/all_margin_left"
android:layout_marginRight="@dimen/all_margin_left"
android:layout_height="match_parent"
android:orientation="horizontal">
<Button
android:id="@+id/onSure"
android:layout_alignParentBottom="true"
style="@style/button_positive_noradius"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="15dp"
android:layout_alignParentBottom="true"
android:onClick="@{onClickListener}"
android:text="确认" />
......
app/src/main/res/layout/fragment_vip_level_edit.xml
View file @ e999ade9
......@@ -202,6 +202,8 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_marginLeft="@dimen/all_margin_left"
android:layout_marginRight="@dimen/all_margin_left"
android:layout_height="match_parent"
android:orientation="horizontal">
......@@ -209,9 +211,7 @@
android:id="@+id/onSure"
style="@style/button_positive_noradius"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginBottom="15dp"
android:onClick="@{onClickListener}"
android:text="确认" />
......
app/src/main/res/layout/fragment_vip_recharge_list.xml
View file @ e999ade9
......@@ -91,7 +91,7 @@
android:text="可用余额" />
<TextView
android:id="@+id/recharge_AMT"
android:id="@+id/balance_AMT"
style="@style/default_blacktext_bigstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......
app/src/main/res/values/dimens.xml
View file @ e999ade9
......@@ -31,7 +31,7 @@
<dimen name="all_text_size_big">22sp</dimen>
<dimen name="all_text_size_big_big">30sp</dimen>
<dimen name="all_text_size_super_big">25sp</dimen>
<dimen name="all_margin_left">17dp</dimen>
<dimen name="all_margin_left">16dp</dimen>
<dimen name="title_height">50dp</dimen>
<dimen name="all_textview_width">120dp</dimen>
<dimen name="all_dialog_button">40dp</dimen>
......
app/src/main/res/values/styles.xml
View file @ e999ade9
......@@ -56,12 +56,12 @@
<style name="default_blacktext_nopadding_smallstyle">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">match_parent</item>
<item name="android:layout_height">48dp</item>
<item name="android:gravity">center_vertical</item>
<item name="android:singleLine">true</item>
<item name="android:padding">@dimen/dp_4</item>
<item name="android:textColor">@color/black</item>
<item name="android:textSize">@dimen/detail_textview_size</item>
<item name="android:textSize">@dimen/all_text_size</item>
</style>
<style name="default_blacktext_margin_smallstyle">
......@@ -76,6 +76,18 @@
<item name="android:textColor">@color/black</item>
<item name="android:textSize">@dimen/detail_textview_size</item>
</style>
<style name="default_blacktext_margin_16_sp_style">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">48dp</item>
<item name="android:gravity">center_vertical</item>
<item name="android:singleLine">true</item>
<item name="android:layout_marginLeft">17dp</item>
<item name="android:padding">@dimen/sp_12</item>
<item name="android:paddingBottom">@dimen/sp_12</item>
<item name="android:paddingTop">@dimen/sp_12</item>
<item name="android:textColor">@color/black</item>
<item name="android:textSize">@dimen/all_text_size</item>
</style>
<style name="default_bluetext_popbutton">
<item name="android:layout_width">wrap_content</item>
......@@ -293,8 +305,8 @@
</style>
<style name="button_positive_noradius">
<item name="android:background">@drawable/selector_gradient_red_button_background_noradius
</item>
<item name="android:background">@drawable/selector_gradient_red_button_background_noradius </item>
<item name="android:layout_height">@dimen/button3_height</item>
<item name="android:textColor">@color/white</item>
<item name="android:gravity">center</item>
<item name="android:focusable">false</item>
......@@ -395,6 +407,14 @@
<item name="android:layout_width">0dp</item>
<item name="android:textSize">@dimen/small_text_size</item>
</style>
<style name="all_edittext_14sp_style">
<item name="android:padding">@dimen/dialog_padding</item>
<item name="android:singleLine">false</item>
<item name="android:saveEnabled">false</item>
<item name="android:background">@drawable/selector_white_background_stroke</item>
<item name="android:layout_width">0dp</item>
<item name="android:textSize">@dimen/all_body_size</item>
</style>
<style name="textView_body">
<item name="android:padding">@dimen/all_padding</item>
......
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