Skip to content

T
TangKuPos
Commit 0c106b20 authored by 陈前's avatar 陈前
Browse files
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipExpenseListFragment.java
#	app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipInfoFragment.java
parents e1e3a298 b9c53427
Hide whitespace changes
Inline Side-by-side
Showing with 310 additions and 7 deletions
app/src/main/java/com/xingdata/zzdpos/ui/settle/SettleActivity.java
View file @ 0c106b20
......@@ -16,6 +16,7 @@ import com.xingdata.zzdpos.model.Vip;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.main.MainActivity;
import com.xingdata.zzdpos.ui.settle.fragment.CashPayFragment;
import com.xingdata.zzdpos.ui.settle.fragment.PasswordFragment;
import com.xingdata.zzdpos.ui.settle.fragment.PayResultFragment;
import com.xingdata.zzdpos.ui.settle.fragment.SettleFragment;
import com.xingdata.zzdpos.ui.settle.fragment.TicketFragment;
......@@ -32,6 +33,7 @@ public class SettleActivity extends BaseActivity<SettlePresenter, ActivitySettle
private VipFragment mVipFragment = new VipFragment();
private CashPayFragment mCashPayFragment = new CashPayFragment();
private PasswordFragment mPasswordFragment = new PasswordFragment();
private PayResultFragment mPayResultFragment = new PayResultFragment();
private LoadingDialog mLoadingDialog = new LoadingDialog();
......@@ -123,7 +125,10 @@ public class SettleActivity extends BaseActivity<SettlePresenter, ActivitySettle
case C.PAY_CHANNEL.CASH:
this.start(mCashPayFragment);
break;
case C.PAY_CHANNEL.TALLY:
case C.PAY_CHANNEL.CARD:
mPasswordFragment.show(this);
break;
}
}
......
app/src/main/java/com/xingdata/zzdpos/ui/settle/fragment/PasswordFragment.java 0 → 100644
View file @ 0c106b20
package com.xingdata.zzdpos.ui.settle.fragment;
import com.blankj.utilcode.util.FragmentUtils;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseSheetDialog;
import com.xingdata.zzdpos.databinding.DialogPasswordBinding;
import com.xingdata.zzdpos.ui.settle.SettlePresenter;
import com.xingdata.zzdpos.ui.settle.view.InputerView;
public class PasswordFragment extends BaseSheetDialog<SettlePresenter, DialogPasswordBinding> {
private InputerView<SettlePresenter> mInputerView = new InputerView<>();
@Override
protected boolean isTransparentBackground() {
return true;
}
@Override
public int getLayoutId() {
return R.layout.dialog_password;
}
@Override
public void initView() {
FragmentUtils.add(getFragmentManager(), mInputerView, R.id.f_inputer);
}
}
app/src/main/java/com/xingdata/zzdpos/ui/store/fragment/StoreFragment.java
View file @ 0c106b20
......@@ -102,7 +102,12 @@ public class StoreFragment extends BaseFragment<StorePresenter, FragmentStoreBin
* @param skugrpId 分组ID
*/
public void loadSkugrpState(Long skugrpId) {
for (int i = 0; i < mSkugrpAdapter.getData().size(); i++) {
if (mSkugrpAdapter.getData().get(i).getSkuGrpId().longValue() == skugrpId) {
mSkugrpAdapter.setSelectedPosition(i);
}
}
mSkugrpAdapter.notifyDataSetChanged();
}
/**
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipExpenseListFragment.java
View file @ 0c106b20
......@@ -22,7 +22,7 @@ import java.util.List;
/**
* 会员消费记录
*/
public class VipExpenseListFragment extends BaseFragment<VipPresenter, FragmentVipExpenseListBinding> {
public class VipExpenseListFragment extends BaseFragment<VipPresenter, FragmentVipExpenseListBinding> {
private VipRechargeAdapter vipRechargeAdapter;
private List<VipRechargeOrder> orders = new ArrayList<>();
......@@ -41,7 +41,7 @@ public class VipExpenseListFragment extends BaseFragment<VipPresenter, FragmentV
mViewBinding.rechargeRefresh.setOnRefreshListener(this::onRefresh);
vipRechargeAdapter.setEnableLoadMore(true);
vipRechargeAdapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.rechargeRecyclerView);
mViewBinding.infoTitle.popMenu.setOnClickListener(view -> {
mViewBinding.infoTitle.popMenu.setOnClickListener(view ->{
new VipEditMenuDialog().show((BaseActivity) getActivity());
});
mViewBinding.infoTitle.ivBack.setOnClickListener(view -> {
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipInfoFragment.java
View file @ 0c106b20
......@@ -11,10 +11,9 @@ import com.bigkoo.pickerview.OptionsPickerView;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.model.VipRechargeOrder;
import com.xingdata.zzdpos.databinding.FragmentViplevelTitleBinding;
import com.xingdata.zzdpos.model.Level;
import com.xingdata.zzdpos.model.VipRechargeOrder;
import com.xingdata.zzdpos.ui.vip.VipPresenter;
import com.xingdata.zzdpos.ui.vip.adapter.VipRechargeAdapter;
......@@ -30,7 +29,7 @@ public class VipInfoFragment extends BaseFragment<VipPresenter, FragmentViplevel
@Override
public int getLayoutId() {
return R.layout.fragment_viplevel_title;
return R.layout.fragment_vip_info;
}
@Override
......
app/src/main/res/layout/dialog_password.xml 0 → 100644
View file @ 0c106b20
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="4"
android:background="@color/transparent"
android:gravity="bottom">
<android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/all_margin"
android:layout_marginEnd="@dimen/all_margin"
android:layout_marginStart="@dimen/all_margin">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingBottom="@dimen/all_margin"
android:paddingTop="@dimen/all_margin">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="会员账户支付"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_spacing"
android:gravity="center"
android:text="$30.00"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/fragment_settle_bigtextsize" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/all_margin"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:layout_width="48dp"
android:layout_height="48dp"
android:background="@drawable/shape_white_round_rectangle_dark"
android:gravity="center"
android:text="*"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_title_size" />
<TextView
android:layout_width="48dp"
android:layout_height="48dp"
android:background="@drawable/shape_white_round_rectangle_dark"
android:gravity="center"
android:text="*"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_title_size" />
<TextView
android:layout_width="48dp"
android:layout_height="48dp"
android:background="@drawable/shape_white_round_rectangle_dark"
android:gravity="center"
android:text="*"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_title_size" />
<TextView
android:layout_width="48dp"
android:layout_height="48dp"
android:background="@drawable/shape_white_round_rectangle_dark"
android:gravity="center"
android:text="*"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_title_size" />
<TextView
android:layout_width="48dp"
android:layout_height="48dp"
android:background="@drawable/shape_white_round_rectangle_dark"
android:gravity="center"
android:text="*"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_title_size" />
<TextView
android:layout_width="48dp"
android:layout_height="48dp"
android:background="@drawable/shape_white_round_rectangle_dark"
android:gravity="center"
android:text="*"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_title_size" />
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
</LinearLayout>
<FrameLayout
android:id="@+id/f_inputer"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="7"
android:background="@color/red_xishi" />
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/fragment_vip_info.xml 0 → 100644
View file @ 0c106b20
<?xml version="1.0" encoding="utf-8"?>
<layout>
<data>
<variable
name="onClickListener"
type="com.xingdata.zzdpos.util.OnClickListener" />
</data>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/bg"
android:orientation="vertical">
<include
android:id="@+id/info_title"
layout="@layout/title_pop" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_margin"
android:background="@color/white"
android:orientation="horizontal">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin_left"
android:orientation="horizontal">
<TextView
style="@style/default_blacktext_smallstyle"
android:layout_width="70dp"
android:layout_height="wrap_content"
android:text="姓名" />
<EditText
style="@style/dialog_edit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@null"
android:hint="请输入手机号" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginRight="@dimen/all_margin_left"
android:background="@color/line_bg" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin_left"
android:orientation="horizontal">
<TextView
style="@style/default_blacktext_smallstyle"
android:layout_width="70dp"
android:layout_height="wrap_content"
android:text="手机号" />
<EditText
style="@style/dialog_edit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
android:hint="请输入姓名" />
</LinearLayout>
</LinearLayout>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="@mipmap/camera" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/line_bg" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin_left"
android:orientation="horizontal">
<TextView
style="@style/default_blacktext_smallstyle"
android:layout_width="70dp"
android:layout_height="wrap_content"
android:text="手机号号" />
<RadioGroup
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="12sp"
android:orientation="horizontal">
<RadioButton
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:button="@null"
android:background="@drawable/radio_select"
android:text="男" />
<RadioButton
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="女" />
</RadioGroup>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/line_bg" />
</LinearLayout>
</layout>
\ No newline at end of file
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