Skip to content

T
TangKuPos
Commit b50ebd43 authored by zhang_z's avatar zhang_z
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 89089164 dbc38ad5
Expand all Show whitespace changes
Inline Side-by-side
Showing with 5376 additions and 2538 deletions
app/src/main/AndroidManifest.xml
View file @ b50ebd43
......@@ -19,7 +19,7 @@
android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
android:label="@string/main_title"
android:launchMode="singleTask"
android:windowSoftInputMode="adjustUnspecified|stateHidden"></activity>
android:windowSoftInputMode="adjustUnspecified|stateHidden"/>
<activity
android:name=".ui.splash.SplashActivity"
android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
......@@ -30,11 +30,11 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name=".ui.login.LoginActivity"
android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
android:windowSoftInputMode="adjustUnspecified|stateHidden" />
<activity
android:name=".ui.exception.ErrorDialogActivity"
android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
......@@ -57,6 +57,11 @@
android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
android:label="@string/title_activity_ticket"
android:theme="@style/AppTheme" />
<activity
android:name=".ui.sendTicke.SendTicketActivity"
android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
android:label="@string/title_activity_ticket"
android:theme="@style/AppTheme" />
<activity
android:name=".ui.settle.SettleActivity"
android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
......@@ -68,7 +73,12 @@
android:theme="@style/AppTheme"
android:windowSoftInputMode="adjustUnspecified|stateHidden" />
<activity android:name=".ui.help.HelpActivity" />
<activity android:name=".ui.feedback.FeedBackActivity"></activity>
<activity android:name=".ui.feedback.FeedBackActivity" />
<activity android:name=".ui.statistics.StatisticsActivity"></activity>
<activity
android:name=".ui.vip.VipActivity"
android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
android:windowSoftInputMode="adjustUnspecified|stateHidden" />
</application>
</manifest>
\ No newline at end of file
app/src/main/java/com/xingdata/zzdpos/C.java
View file @ b50ebd43
......@@ -19,6 +19,8 @@ public class C {
public static final int MENU_UPDATE = 109;
public static final int MENU_HELP = 110;
public static final int MENU_EXIT = 111;
public static final int MENU_STATISTICS_ORDER = 1051;
public static final int MENU_STATISTICS_MS = 1052;
}
......
app/src/main/java/com/xingdata/zzdpos/base/BaseDialog.java
View file @ b50ebd43
......@@ -69,7 +69,7 @@ public abstract class BaseDialog<P extends BasePresenter, B extends ViewDataBind
}
protected void seConfirmEnable( boolean isEnable){
protected void seConfirmEnable(boolean isEnable) {
mBaseBinding.btnConfirm.setEnabled(isEnable);
}
......@@ -143,7 +143,7 @@ public abstract class BaseDialog<P extends BasePresenter, B extends ViewDataBind
super.onActivityCreated(savedInstanceState);
if (!isEasy()) {
WindowManager.LayoutParams attributes = getDialog().getWindow().getAttributes();
attributes.width = ScreenUtils.getScreenWidth() * 45 / 100;
attributes.width = ScreenUtils.getScreenWidth() * 95 / 100;
attributes.height = -2;
getDialog().getWindow().setAttributes(attributes);
}
......
app/src/main/java/com/xingdata/zzdpos/model/Category.java
View file @ b50ebd43
......@@ -3,6 +3,7 @@ package com.xingdata.zzdpos.model;
import com.alibaba.fastjson.annotation.JSONField;
import com.bigkoo.pickerview.model.IPickerViewData;
import com.xingdata.zzdpos.base.BaseBean;
import com.xingdata.zzdpos.ui.marketing.integral.fragment.IntegralGetFragment;
/**
* Created by Administrator on 2017/11/27.
......@@ -132,15 +133,15 @@ public class Category implements BaseBean, IPickerViewData {
@Override
public String getPickerViewText() {
switch (nowCategory) {
// case IntegralGetDialog.ONE_CATEGORY: {
// return getSpuClaName() + "";
// }
// case IntegralGetDialog.TWO_CATEGORY: {
// return getSpuGrpName() + "";
// }
// case IntegralGetDialog.THREE_CATEGORY: {
// return getSpuCateName() + "";
// }
case IntegralGetFragment.ONE_CATEGORY: {
return getSpuClaName() + "";
}
case IntegralGetFragment.TWO_CATEGORY: {
return getSpuGrpName() + "";
}
case IntegralGetFragment.THREE_CATEGORY: {
return getSpuCateName() + "";
}
}
return "";
......
app/src/main/java/com/xingdata/zzdpos/ui/login/LoginActivity.java
View file @ b50ebd43
......@@ -23,6 +23,8 @@ import com.xingdata.zzdpos.ui.login.fragment.bean.LoginReturnBean;
import com.xingdata.zzdpos.ui.login.fragment.bean.StoreAddressJsonBean;
import com.xingdata.zzdpos.ui.login.fragment.bean.StoreTypeJsonBean;
import com.xingdata.zzdpos.ui.marketing.integral.IntegralActivity;
import com.xingdata.zzdpos.ui.marketing.ticket.ReturnTicketActivity;
import com.xingdata.zzdpos.ui.payment.PaymentActivity;
import com.xingdata.zzdpos.ui.splash.SplashActivity;
import com.xingdata.zzdpos.view.PopupWindowDownList;
......
app/src/main/java/com/xingdata/zzdpos/ui/main/MainActivity.java
View file @ b50ebd43
......@@ -8,6 +8,7 @@ import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentPagerAdapter;
import android.view.View;
import com.blankj.utilcode.util.ActivityUtils;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.databinding.ActivityMainBinding;
......@@ -33,7 +34,7 @@ import io.reactivex.schedulers.Schedulers;
public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBinding> implements MainContract.View {
private int[] titleInts = {R.string.menu_cashier, R.string.menu_service, R.string.menu_myself};
private int[] iconList = {R.mipmap.icon_menu_cashier_1, R.mipmap.icon_menu_service_0, R.mipmap.icon_menu_myself_0};
private FragmentPagerAdapter mFragmentPagerAdapter;
private FragmentViewAdapter mFragmentPagerAdapter;
// private List<View> views=new ArrayList<>();
private List<ItemMenuBottomBinding> itemMenuBottomBindings = new ArrayList<>();
private HandoverDialog mHandoverDialog = new HandoverDialog();
......@@ -134,6 +135,12 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
}
@Override
public void handoverOk() {
mHandoverDialog.dismiss();
ActivityUtils.finishAllActivities();
}
@Override
public void showHandoverDialog() {
mHandoverDialog.show(this);
......
app/src/main/java/com/xingdata/zzdpos/ui/main/MainContract.java
View file @ b50ebd43
......@@ -7,10 +7,10 @@ import com.xingdata.zzdpos.base.BaseView;
interface MainContract {
interface View extends BaseView {
// /**
// * 交班确认
// */
// void handoverOk();
/**
* 交班确认
*/
void handoverOk();
//
// /**
// * 显示修改密码页面
......@@ -270,10 +270,10 @@ interface MainContract {
// */
// public abstract void clickChangePassword();
//
// /**
// * 菜单EXIT页面 - 点击交班 打开交班报表页面
// */
// public abstract void clickHandover();
/**
* 菜单EXIT页面 - 点击交班 打开交班报表页面
*/
public abstract void clickHandover();
//
//
// /**
......@@ -527,10 +527,10 @@ interface MainContract {
// */
// public abstract void clickFeedOk(Feed feed);
//
// /**
// * 注销
// */
// public abstract void logout();
/**
* 注销
*/
public abstract void logout();
//
//
// /**
......
app/src/main/java/com/xingdata/zzdpos/ui/main/MainPresenter.java
View file @ b50ebd43
......@@ -12,6 +12,7 @@ import com.blankj.utilcode.util.StringUtils;
import com.blankj.utilcode.util.TimeUtils;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.api.print.ZX_PrintPOS;
import com.xingdata.zzdpos.api.ApiFactory;
import com.xingdata.zzdpos.db.DBFactory;
import com.xingdata.zzdpos.model.HandoverInfo;
import com.xingdata.zzdpos.ui.login.LoginPresenter;
......@@ -29,7 +30,8 @@ import io.reactivex.functions.Function;
public class MainPresenter extends MainContract.Presenter {
public static HandoverInfo handoverInfo;
//
//
// /**
// * 当前的使用的支付方式
// */
......@@ -116,7 +118,7 @@ public class MainPresenter extends MainContract.Presenter {
// this.getMsList();
}
// @Override
// @Override
// public void clickLock() {
// mView.goLockActivity();
// }
......@@ -131,12 +133,12 @@ public class MainPresenter extends MainContract.Presenter {
// mView.showChangePasswordDialog();
// }
//
// @Override
// public void clickHandover() {
// mView.showHandoverDialog();
// }
//
//
@Override
public void clickHandover() {
mView.showHandoverDialog();
}
//
// @Override
// public void clickFeedback() {
// mView.showFeedbackDialog();
......@@ -933,11 +935,11 @@ public class MainPresenter extends MainContract.Presenter {
@Override
public void clickHandoverOk() {
// logout();
// mView.handoverOk();
logout();
mView.handoverOk();
}
// @Override
// @Override
// public void clickFeedOk(Feed feed) {
// ApiFactory.Feed.addFeed(feed)
// .subscribe(object -> {
......@@ -946,14 +948,14 @@ public class MainPresenter extends MainContract.Presenter {
// });
// }
//
// @Override
// public void logout() {
// ApiFactory.Test.logout()
// .subscribe(object -> {
// }, throwable -> {
// ToastUtils.showShort(throwable.getMessage());
// });
// }
@Override
public void logout() {
ApiFactory.Test.logout()
.subscribe(object -> {
}, throwable -> {
ToastUtils.showShort(throwable.getMessage());
});
}
//
// @Override
// public void searchBarHasFocus(boolean isHas) {
......
app/src/main/java/com/xingdata/zzdpos/ui/main/dialog/HandoverDialog.java
View file @ b50ebd43
......@@ -24,7 +24,7 @@ public class HandoverDialog extends BaseDialog<MainPresenter, DialogHandoverBind
@Override
public int getTitle() {
return R.string.handover_title;
return R.string.handover_hint;
}
@Override
......
app/src/main/java/com/xingdata/zzdpos/ui/main/fragment/CasherFragment.java
View file @ b50ebd43
package com.xingdata.zzdpos.ui.main.fragment;
import android.content.Intent;
import android.support.v7.widget.GridLayoutManager;
import android.view.View;
import com.blankj.utilcode.util.ActivityUtils;
import com.blankj.utilcode.util.ActivityUtils;
import com.chad.library.adapter.base.BaseQuickAdapter;
......@@ -14,8 +16,10 @@ import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentCasherBinding;
import com.xingdata.zzdpos.ui.main.MainPresenter;
import com.xingdata.zzdpos.ui.main.adapter.MenuRecyclerAdapter;
import com.xingdata.zzdpos.ui.vip.VipActivity;
import com.xingdata.zzdpos.ui.payment.PaymentActivity;
import com.xingdata.zzdpos.ui.splash.SplashActivity;
import com.xingdata.zzdpos.ui.statistics.StatisticsActivity;
import com.xingdata.zzdpos.util.MyMenuItemDecoration;
import com.xingdata.zzdpos.util.OnClickListener;
......@@ -51,7 +55,7 @@ public class CasherFragment extends BaseFragment<MainPresenter, FragmentCasherBi
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
switch ((int) adapter.getData().get(position)) {
case C.MENU.MENU_VIP://会员
ActivityUtils.startActivity(new Intent(getActivity(),VipActivity.class));
break;
case C.MENU.MENU_RECHARGE://充值
......@@ -63,7 +67,7 @@ public class CasherFragment extends BaseFragment<MainPresenter, FragmentCasherBi
break;
case C.MENU.MENU_STATISTICS://统计
ActivityUtils.startActivity(getActivity(), StatisticsActivity.class);
break;
case C.MENU.MENU_MANAGER://管理
......@@ -84,6 +88,12 @@ public class CasherFragment extends BaseFragment<MainPresenter, FragmentCasherBi
ActivityUtils.startActivity(getActivity(), SplashActivity.class);
}
});
mViewBinding.btnHandover.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
mPresenter.clickHandover();
}
});
}
}
app/src/main/java/com/xingdata/zzdpos/ui/main/fragment/MyselfFragment.java
View file @ b50ebd43
......@@ -62,7 +62,7 @@ public class MyselfFragment extends BaseFragment<MainPresenter, FragmentMyselfBi
ActivityUtils.startActivity(getActivity(), HelpActivity.class);
break;
case C.MENU.MENU_EXIT://退出
mPresenter.clickHandover();
break;
}
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/integral/IntegralPresenter.java
View file @ b50ebd43
......@@ -8,6 +8,9 @@ import com.xingdata.zzdpos.model.Category;
import com.xingdata.zzdpos.model.Gbound;
import com.xingdata.zzdpos.model.Ubound;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.marketing.integral.fragment.IntegralExchangeFragment;
import com.xingdata.zzdpos.ui.marketing.integral.fragment.IntegralGetFragment;
import com.xingdata.zzdpos.ui.marketing.integral.fragment.IntegralIndexFragment;
import java.util.List;
......@@ -19,7 +22,9 @@ import io.reactivex.functions.Function;
public class IntegralPresenter extends IntegralContract.Presenter {
private int number = 1;
public IntegralIndexFragment integralIndexFragment = new IntegralIndexFragment();
public IntegralGetFragment integralGetFragment = new IntegralGetFragment();
public IntegralExchangeFragment integralExchangeFragment = new IntegralExchangeFragment();
@Override
public void onAttached() {
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/integral/adapter/IntegralAdapter.java
View file @ b50ebd43
......@@ -35,9 +35,9 @@ public class IntegralAdapter extends BaseAdapter<Gbound, ItemIntegralBinding> {
mViewBinding.tvGet.setText(item.getTruleName());
//开通启用状态 0：正常 1 暂停 默认 0
if (item.getBoundGetStatus() == 0) {
mViewBinding.tvStatus.setImageResource(R.mipmap.integral_open);
mViewBinding.tvStatus.setText("启用");
} else {
mViewBinding.tvStatus.setImageResource(R.mipmap.integral_close);
mViewBinding.tvStatus.setText("未启用");
}
}
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/integral/adapter/IntegralExchangeAdapter.java
View file @ b50ebd43
......@@ -2,8 +2,6 @@ package com.xingdata.zzdpos.ui.marketing.integral.adapter;
import android.support.annotation.Nullable;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseAdapter;
import com.xingdata.zzdpos.databinding.ItemIntegralBinding;
import com.xingdata.zzdpos.model.Ubound;
......@@ -22,6 +20,11 @@ public class IntegralExchangeAdapter extends BaseAdapter<Ubound, ItemIntegralBin
@Override
protected void convert(ItemIntegralBinding mViewBinding, Ubound item) {
mViewBinding.tvVipTitle.setText("积分面值");
mViewBinding.tvSourceTitle.setText("兑换规则");
mViewBinding.tvVip.setText(item.getBoundValAmt() + "个积分=1元");
//兑换规则
if (item.getBoundOrderAmt() != null && item.getBoundUseNum() != null) {
......@@ -33,9 +36,9 @@ public class IntegralExchangeAdapter extends BaseAdapter<Ubound, ItemIntegralBin
if (item.getBoundUseStatus() != null) {
//开通启用状态 0：正常 1 暂停 默认 0
if (item.getBoundUseStatus() == 0) {
mViewBinding.tvStatus.setImageResource(R.mipmap.integral_open);
mViewBinding.tvStatus.setText("启用");
} else {
mViewBinding.tvStatus.setImageResource(R.mipmap.integral_close);
mViewBinding.tvStatus.setText("未启用");
}
}
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/integral/fragment/IntegralExchangeFragment.java 0 → 100644
View file @ b50ebd43
package com.xingdata.zzdpos.ui.marketing.integral.fragment;
import android.text.TextUtils;
import android.view.View;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.DialogIntegralExchangeSettingBinding;
import com.xingdata.zzdpos.model.Ubound;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.marketing.integral.IntegralPresenter;
import com.xingdata.zzdpos.util.ConvertUtil;
import com.xingdata.zzdpos.util.OnClickListener;
/**
* 绑定款台界面
* <p>
* 设备没有绑定款台的进行绑定操作
*/
public class IntegralExchangeFragment extends BaseFragment<IntegralPresenter,
DialogIntegralExchangeSettingBinding> {
Ubound ubound;
@Override
public int getLayoutId() {
return R.layout.dialog_integral_exchange_setting;
}
@Override
public void initView() {
mViewBinding.icTitle.tvTitle.setText("积分规则");
mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
pop();
}
});
mViewBinding.setOnClickListener(view -> {
// hintKbTwo();
switch (view.getId()) {
case R.id.rd_suspendeds: {
//暂停
ubound.setBoundUseStatus((byte) 1);
}
break;
case R.id.rd_starts: {
//启用
ubound.setBoundUseStatus((byte) 0);
}
break;
case R.id.btn_ok: {
if (isNullAndSet()) {
LoadingDialog loadingDialog = new LoadingDialog();
loadingDialog.show((BaseActivity) getActivity());
ubound.setUpdateTime(null);
ubound.setCreateTime(null);
mPresenter.exchangeUpdate(ubound, loadingDialog);
} else {
ToastUtils.showLong("输入数据不能null");
}
}
break;
}
});
initUiData();
}
private void initUiData() {
if (ubound != null) {
if (ubound.getBoundUseStatus() != null && ubound.getBoundUseStatus() == 0) {
mViewBinding.rdStarts.setChecked(true);
} else if (ubound.getBoundUseStatus() != null && ubound.getBoundUseStatus() == 1) {
mViewBinding.rdSuspendeds.setChecked(true);
}
if (ubound.getBoundValAmt() != null) {
mViewBinding.etIntegralExchangeRuleCountMoney.setText(ubound.getBoundValAmt() + "");
}
if (ubound.getBoundOrderAmt() != null) {
mViewBinding.etIntegralExchangeMoney.setText(ConvertUtil.fenToYuanNoPoint(ubound
.getBoundOrderAmt()));
}
if (ubound.getBoundUseNum() != null) {
mViewBinding.etIntegralExchangeCount.setText(ubound.getBoundUseNum() + "");
}
}
}
public void setData(Ubound ubound) {
this.ubound = ubound;
}
/**
* 判断用户输入数据是否为null
*
* @return 输入为null返回false 反之返回true
*/
private boolean isNullAndSet() {
if (ubound == null || ubound.getBoundUseStatus() == null) {
return false;
}
if (TextUtils.isEmpty(mViewBinding.etIntegralExchangeRuleCountMoney.getText().toString())
|| TextUtils.isEmpty(mViewBinding.etIntegralExchangeMoney.getText().toString())
|| TextUtils.isEmpty(mViewBinding.etIntegralExchangeCount.getText().toString
())) {
return false;
}
ubound.setBoundValAmt(Long.parseLong(mViewBinding.etIntegralExchangeRuleCountMoney
.getText().toString()));
ubound.setBoundOrderAmt(ConvertUtil.yuanToFen(mViewBinding.etIntegralExchangeMoney
.getText().toString()));
ubound.setBoundUseNum(Long.parseLong(mViewBinding.etIntegralExchangeCount.getText()
.toString()));
return true;
}
// /**
// * 显示软键盘，Dialog使用
// */
// public void hintKbTwo() {
// View view = getDialog().getCurrentFocus();
// if (view == null) {
// return;
// }
// if (view instanceof TextView) {
// InputMethodManager mInputMethodManager = (InputMethodManager) getContext()
// .getSystemService(Context.INPUT_METHOD_SERVICE);
// mInputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), InputMethodManager
// .RESULT_UNCHANGED_SHOWN);
// }
// }
// @Override
// public void dismiss() {
// hintKbTwo();
// super.dismiss();
// }
}
app/src/main/java/com/xingdata/zzdpos/ui/marketing/integral/fragment/IntegralIndexFragment.java 0 → 100644
View file @ b50ebd43
package com.xingdata.zzdpos.ui.marketing.integral.fragment;
import android.support.annotation.Nullable;
import android.support.v7.widget.LinearLayoutManager;
import android.view.View;
import android.widget.TextView;
import com.blankj.utilcode.util.ActivityUtils;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentIntegralMainBinding;
import com.xingdata.zzdpos.model.Category;
import com.xingdata.zzdpos.model.Gbound;
import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Ubound;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.marketing.integral.IntegralActivity;
import com.xingdata.zzdpos.ui.marketing.integral.IntegralPresenter;
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.util.ArrayList;
import java.util.List;
/**
* 绑定款台界面
* <p>
* 设备没有绑定款台的进行绑定操作
*/
public class IntegralIndexFragment extends BaseFragment<IntegralPresenter,
FragmentIntegralMainBinding> {
// IntegralGetDialog integralGetDialog;
IntegralAdapter integralAdapter;
IntegralExchangeAdapter integralExchangeAdapter;
private Boolean isLoadMore = false;
public static final int NORMAL_TYPE = 1;
public static final int LOADMORE_TYPE = 2;
public static final int REFRESH_TYPE = 3;
LoadingDialog loadingDialog = new LoadingDialog();
private long mExitTime;//控制快速点击
@Override
public int getLayoutId() {
return R.layout.fragment_integral_main;
}
@Override
public void initView() {
mViewBinding.icTitle.tvTitle.setText("积分规则");
mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
ActivityUtils.finishActivity(IntegralActivity.class);
}
});
integralAdapter = new IntegralAdapter(R.layout.item_integral, new ArrayList<>());
LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getActivity());
linearLayoutManager.setOrientation(LinearLayoutManager.VERTICAL);
mViewBinding.rvMessage.setLayoutManager(linearLayoutManager);
mViewBinding.rvMessage.setAdapter(integralAdapter);
List<Ubound> list = new ArrayList<>();
Ubound ubound = new Ubound();
ubound.setBoundValAmt(1000l);
ubound.setBoundUseStatus((byte) 0);
ubound.setBoundOrderAmt(10l);
ubound.setBoundUseNum(10000l);
list.add(ubound);
integralExchangeAdapter = new IntegralExchangeAdapter(R.layout.item_integral, list);
LinearLayoutManager linearLayoutManager1 = new LinearLayoutManager(getActivity());
linearLayoutManager1.setOrientation(LinearLayoutManager.VERTICAL);
mViewBinding.rvExchangeMessage.setLayoutManager(linearLayoutManager1);
mViewBinding.rvExchangeMessage.setAdapter(integralExchangeAdapter);
mViewBinding.setOnClickListener(v -> {
switch (v.getId()) {
case R.id.btn_add: {
mPresenter.integralGetFragment = new IntegralGetFragment();
mPresenter.integralGetFragment.setNowType(1);
start(mPresenter.integralGetFragment);
// integralGetDialog = new IntegralGetDialog();
// integralGetDialog.setNowType(1);
// integralGetDialog.show((BaseActivity) getActivity());
}
break;
case R.id.rb_get: {
mViewBinding.rbGet.getPaint().setFakeBoldText(true);
mViewBinding.rbExchange.getPaint().setFakeBoldText(false);
showView(v.getId());
mPresenter.query(1, NORMAL_TYPE, null);
}
break;
case R.id.rb_exchange: {
mViewBinding.rbGet.getPaint().setFakeBoldText(false);
mViewBinding.rbExchange.getPaint().setFakeBoldText(true);
showView(v.getId());
LoadingDialog loadingDialog = new LoadingDialog();
loadingDialog.show((BaseActivity) getActivity());
mPresenter.exchangeQuery(loadingDialog);
}
break;
default: {
}
break;
}
});
//set Presenter listener
mViewBinding.srlProduct.setOnRefreshListener(this::refreshProduct);
integralAdapter.setOnLoadMoreListener(this::loadMoreProduct, mViewBinding.rvMessage);
integralAdapter.setOnItemClickListener((adapter, view, position) -> clickProduct
(integralAdapter.getData().get(position)));
integralExchangeAdapter.setOnItemClickListener((adapter, view, position) ->
exchangeClickProduct(integralExchangeAdapter.getData().get(position)));
mPresenter.query(1, NORMAL_TYPE, null);
}
public void initComplete(List<Category> list, int nowCategory) {
if (list.size() <= 0) {
return;
}
mPresenter.integralGetFragment.setCategoryDate(list, nowCategory);
}
public void querySucc(@Nullable Pager<Gbound> pager, Boolean isLoadMore, int queryType,
LoadingDialog loadingDialog) {
if (loadingDialog != null) {
loadingDialog.dismiss();
}
this.isLoadMore = isLoadMore;
if (pager == null || pager.getList() == null || pager.getList().size() <= 0) {
integralAdapter.setEmptyView(getEmptyView("没有规则"));
}
if (pager.getList() != null) {
switch (queryType) {
case NORMAL_TYPE: {
//正常请求
integralAdapter.setNewData(pager.getList());
}
break;
case LOADMORE_TYPE: {
//加载更多
integralAdapter.addData(pager.getList());
}
break;
case REFRESH_TYPE: {
//刷新请求
integralAdapter.setNewData(pager.getList());
}
break;
}
}
integralAdapter.setEnableLoadMore(false);
mViewBinding.srlProduct.setRefreshing(false);
}
public void exchangeQuerySucc(Pager<Ubound> uboundPager, LoadingDialog loadingDialog) {
if (loadingDialog != null) {
loadingDialog.dismiss();
}
if (uboundPager != null && uboundPager.getList() != null) {
integralExchangeAdapter.setNewData(uboundPager.getList());
}
}
/**
* 刷新商品
*/
private void refreshProduct() {
integralAdapter.setEnableLoadMore(false);
mPresenter.query(1, REFRESH_TYPE, null);
}
/**
* 加载更多商品
*/
private void loadMoreProduct() {
mViewBinding.srlProduct.setRefreshing(false);
if (isLoadMore) {
mPresenter.query(-1, LOADMORE_TYPE, null);
}
}
/**
* 积分获取页面点击item
*/
private void clickProduct(Gbound gbound) {
if ((System.currentTimeMillis() - mExitTime) > 1000) {
// integralGetDialog = new IntegralGetDialog();
loadingDialog.show((BaseActivity) getActivity());
mPresenter.integralGetFragment = new IntegralGetFragment();
mPresenter.integralGetFragment.setData(gbound, loadingDialog);
start(mPresenter.integralGetFragment);
// integralGetDialog.show((BaseActivity) getActivity());
mExitTime = System.currentTimeMillis();
} else {
ToastUtils.showLong("您操作太快了");
}
}
/**
* 积分兑换页面点击item
*/
private void exchangeClickProduct(Ubound gbound) {
if ((System.currentTimeMillis() - mExitTime) > 1000) {
mPresenter.integralExchangeFragment = new IntegralExchangeFragment();
mPresenter.integralExchangeFragment.setData(gbound);
start(mPresenter.integralExchangeFragment);
// IntegralExchangeDialog integralExchangeDialog = new IntegralExchangeDialog();
// integralExchangeDialog.setData(gbound);
// integralExchangeDialog.show((BaseActivity) getActivity());
mExitTime = System.currentTimeMillis();
} else {
ToastUtils.showLong("您操作太快了");
}
}
private View getEmptyView(String str) {
View view = getLayoutInflater().inflate(R.layout.view_empty, null);
((TextView) view.findViewById(R.id.tv_empty)).setText(str);
return view;
}
private void showView(int id) {
switch (id) {
case R.id.rb_get: {
mViewBinding.llGet.setVisibility(View.VISIBLE);
mViewBinding.llExchange.setVisibility(View.GONE);
}
break;
case R.id.rb_exchange: {
mViewBinding.llGet.setVisibility(View.GONE);
mViewBinding.llExchange.setVisibility(View.VISIBLE);
}
break;
}
}
}
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ticket/ReturnTicketActivity.java
View file @ b50ebd43
package com.xingdata.zzdpos.ui.marketing.ticket;
import android.support.v7.widget.GridLayoutManager;
import android.text.Html;
import android.view.View;
import com.blankj.utilcode.util.ActivityUtils;
import com.blankj.utilcode.util.LogUtils;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.R;
......@@ -13,18 +8,10 @@ import com.xingdata.zzdpos.databinding.ActivityReturnTicketBinding;
import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Trule;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.marketing.ticket.adapter.ReturnTicketAdapter;
import com.xingdata.zzdpos.ui.marketing.ticket.dialog.TicketAddDialog;
import com.xingdata.zzdpos.util.OnClickListener;
import com.xingdata.zzdpos.util.RecyclerViewUtil;
import java.util.ArrayList;
public class ReturnTicketActivity extends BaseActivity<ReturnTicketPresenter,
ActivityReturnTicketBinding>
implements ReturnTicketContract.View {
ReturnTicketAdapter returnTicketAdapter;
LoadingDialog loadingDialog = new LoadingDialog();
@Override
......@@ -34,49 +21,7 @@ public class ReturnTicketActivity extends BaseActivity<ReturnTicketPresenter,
@Override
public void initView() {
mViewBinding.icTitle.tvTitle.setText("优惠券规则");
mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
ActivityUtils.finishActivity(ReturnTicketActivity.class);
}
});
mViewBinding.btnGroup.setText(Html.fromHtml(
getResources().
getString(R.string
.tv_ticket_count, "<font color='#1f7bdb'><big> " + "0" + " " +
"</big></font>")));
final int SPACING = mContext.getResources().getDimensionPixelOffset(R.dimen
.vip_message_item_spacing);
returnTicketAdapter = new
ReturnTicketAdapter(new ArrayList<>(), mPresenter);
mViewBinding.rcTicket.setAdapter(returnTicketAdapter);
mViewBinding.rcTicket.setLayoutManager(new
GridLayoutManager(ReturnTicketActivity.this,
4));
mViewBinding.rcTicket.addItemDecoration(new RecyclerViewUtil.GridSpacingItemDecoration(4,
SPACING, true));
mViewBinding.setOnClickListener(view ->
{
switch (view.getId()) {
case R.id.btn_add: {
mPresenter.ticketAddDialog = new TicketAddDialog();
mPresenter.ticketAddDialog.show(this);
}
break;
default: {
}
break;
}
});
loadRootFragment(R.id.frg, mPresenter.tickerIndexFragment);
}
......@@ -89,45 +34,27 @@ public class ReturnTicketActivity extends BaseActivity<ReturnTicketPresenter,
@Override
public void addSucc(LoadingDialog loadingDialog) {
if (mPresenter.ticketAddDialog != null && mPresenter.ticketAddDialog.isShowing) {
mPresenter.ticketAddDialog.dismiss();
}
// if (mPresenter.ticketAddDialog != null && mPresenter.ticketAddDialog.isShowing) {
// mPresenter.ticketAddDialog.dismiss();
// }
pop();
mPresenter.truleQuery(loadingDialog);
}
@Override
public void truleQuerySucc(Pager<Trule> trulePager, LoadingDialog loadingDialog) {
closeLoading(loadingDialog);
if (trulePager == null || trulePager.getList() == null || trulePager.getList().size() <=
0) {
mViewBinding.tvEmpty.setVisibility(View.VISIBLE);
}
if (trulePager != null && trulePager.getList() != null) {
mViewBinding.tvEmpty.setVisibility(View.GONE);
returnTicketAdapter.setNewData(trulePager.getList());
mViewBinding.btnGroup.setText(Html.fromHtml(getResources().getString(R.string
.tv_ticket_count,
"<font color='#1f7bdb'><big> " + trulePager.getList().size() + " " +
"</big></font>")));
}
mPresenter.tickerIndexFragment.truleQuerySucc(trulePager, loadingDialog);
}
@Override
public void truleUpdateSucc(LoadingDialog loadingDialog) {
if (mPresenter.ticketAddDialog != null && mPresenter.ticketAddDialog.isShowing) {
mPresenter.ticketAddDialog.dismiss();
}
// if (mPresenter.ticketAddDialog != null && mPresenter.ticketAddDialog.isShowing) {
// mPresenter.ticketAddDialog.dismiss();
// }
pop();
mPresenter.truleQuery(loadingDialog);
}
private void closeLoading(LoadingDialog loadingDialog) {
if (loadingDialog != null) {
loadingDialog.dismiss();
}
}
@Override
protected void onResume() {
......@@ -136,4 +63,9 @@ public class ReturnTicketActivity extends BaseActivity<ReturnTicketPresenter,
mPresenter.truleQuery(loadingDialog);
}
private void closeLoading(LoadingDialog loadingDialog) {
if (loadingDialog != null) {
loadingDialog.dismiss();
}
}
}
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ticket/ReturnTicketPresenter.java
View file @ b50ebd43
......@@ -5,7 +5,8 @@ import android.support.annotation.Nullable;
import com.xingdata.zzdpos.api.ApiFactory;
import com.xingdata.zzdpos.model.Trule;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.marketing.ticket.dialog.TicketAddDialog;
import com.xingdata.zzdpos.ui.marketing.ticket.fragment.TickerAddFragment;
import com.xingdata.zzdpos.ui.marketing.ticket.fragment.TickerIndexFragment;
/**
......@@ -13,8 +14,8 @@ import com.xingdata.zzdpos.ui.marketing.ticket.dialog.TicketAddDialog;
*/
public class ReturnTicketPresenter extends ReturnTicketContract.Presenter {
public TicketAddDialog ticketAddDialog;
public TickerIndexFragment tickerIndexFragment = new TickerIndexFragment();
public TickerAddFragment tickerAddFragment = new TickerAddFragment();
@Override
public void onAttached() {
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ticket/adapter/ReturnTicketAdapter.java
View file @ b50ebd43
......@@ -4,14 +4,13 @@ import android.support.annotation.Nullable;
import android.view.View;
import com.blankj.utilcode.util.TimeUtils;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.base.BaseAdapter;
import com.xingdata.zzdpos.databinding.ItemReturnTicketBinding;
import com.xingdata.zzdpos.model.Trule;
import com.xingdata.zzdpos.ui.marketing.ticket.ReturnTicketActivity;
import com.xingdata.zzdpos.ui.marketing.ticket.ReturnTicketPresenter;
import com.xingdata.zzdpos.ui.marketing.ticket.dialog.TicketAddDialog;
import com.xingdata.zzdpos.ui.marketing.ticket.fragment.TickerAddFragment;
import com.xingdata.zzdpos.util.ConvertUtil;
import java.text.SimpleDateFormat;
......@@ -19,19 +18,24 @@ import java.util.List;
public class ReturnTicketAdapter extends BaseAdapter<Trule, ItemReturnTicketBinding> {
ReturnTicketPresenter mPersenter;
ReturnTicketActivity returnTicketActivity;
public ReturnTicketAdapter(@Nullable List<Trule> data, ReturnTicketPresenter mPersenter) {
public ReturnTicketAdapter(@Nullable List<Trule> data, ReturnTicketPresenter mPersenter,
ReturnTicketActivity returnTicketActivity) {
super(R.layout.item_return_ticket, data);
this.mPersenter = mPersenter;
this.returnTicketActivity = returnTicketActivity;
}
@Override
protected void convert(ItemReturnTicketBinding mViewBinding, Trule item) {
mViewBinding.tvTicket.setText("优\n惠\n券");
// mViewBinding.tvSend.setText("发\n券");
mViewBinding.tvSend.setText("\n");
mViewBinding.tvTicketMoney.setText(ConvertUtil.fenToYuanNoPoint(item.getTruleValAmt()));
// mViewBinding.tvSend.setText("\n");
mViewBinding.tvTicketMoney.setText(mContext.getResources().getString(R.string.tv_money,
ConvertUtil.fenToYuanNoPoint(item.getTruleValAmt())));
mViewBinding.tvTicketMoneys.setText(mContext.getResources().getString(R.string.money,
ConvertUtil.fenToYuanNoPoint(item.getTruleValAmt())));
mViewBinding.tvRule.setText(mContext.getResources().getString(R.string.tv_rule,
ConvertUtil.fenToYuanNoPoint(item.getTruleOrderAmt())));
mViewBinding.tvDate.setText(mContext.getResources().getString(R.string.tv_date,
......@@ -39,16 +43,16 @@ public class ReturnTicketAdapter extends BaseAdapter<Trule, ItemReturnTicketBind
mViewBinding.clSend.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
ToastUtils.showLong("发券");
// ToastUtils.showLong("发券");
}
});
mViewBinding.clItem.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
mPersenter.ticketAddDialog = new TicketAddDialog();
mPersenter.ticketAddDialog.setNowType(2);
mPersenter.ticketAddDialog.editTicketData(item);
mPersenter.ticketAddDialog.show((BaseActivity) mContext);
mPersenter.tickerAddFragment = new TickerAddFragment();
mPersenter.tickerAddFragment.setNowType(2);
mPersenter.tickerAddFragment.editTicketData(item);
returnTicketActivity.start(mPersenter.tickerAddFragment);
}
});
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ticket/fragment/TickerAddFragment.java 0 → 100644
View file @ b50ebd43
package com.xingdata.zzdpos.ui.marketing.ticket.fragment;
import android.app.DatePickerDialog;
import android.content.Context;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.view.View;
import android.view.inputmethod.InputMethodManager;
import android.widget.DatePicker;
import android.widget.TextView;
import com.blankj.utilcode.util.TimeUtils;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.DialogTicketAddSettingBinding;
import com.xingdata.zzdpos.model.Trule;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.marketing.ticket.ReturnTicketPresenter;
import com.xingdata.zzdpos.util.ConvertUtil;
import com.xingdata.zzdpos.util.OnClickListener;
import java.text.SimpleDateFormat;
import java.util.Calendar;
public class TickerAddFragment extends BaseFragment<ReturnTicketPresenter,
DialogTicketAddSettingBinding> {
LoadingDialog loadingDialog = new LoadingDialog();
//0：正常 1暂停
private byte nowStatus = 1;
//当前编辑的对象
private Trule trule = new Trule();
//1为新增，2为更新
private int nowType = 1;
@Override
public int getLayoutId() {
return R.layout.dialog_ticket_add_setting;
}
@Override
public void initView() {
mViewBinding.icTitles.tvTitle.setText("新增优惠券");
mViewBinding.icTitles.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
pop();
}
});
hintKbTwo();
mViewBinding.etTicketMoney.addTextChangedListener(mTextWatcher);
mViewBinding.etRuleMoney.addTextChangedListener(mTextWatcher);
mViewBinding.etTicketCount.addTextChangedListener(mTextWatcher);
if (nowType == 2) {
mViewBinding.icTitles.tvTitle.setText("编辑优惠券");
mViewBinding.tvIntegralRuleName.setText(trule.getTruleName());
if (trule.getTruleStatus() == 1) {
mViewBinding.rbSuspended.setChecked(true);
} else if (trule.getTruleStatus() == 0) {
mViewBinding.rbStart.setChecked(true);
}
mViewBinding.etTicketMoney.setText(ConvertUtil.fenToYuanNoPoint(trule.getTruleValAmt
()));
mViewBinding.tvDate.setText(TimeUtils.millis2String(trule.getTruleExp(), new
SimpleDateFormat("yyyy-mm-dd")));
mViewBinding.etRuleMoney.setText(ConvertUtil.fenToYuanNoPoint(trule.getTruleOrderAmt
()));
mViewBinding.etTicketCount.setText(trule.getTruleUseNum() + "");
}
mViewBinding.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View view) {
hintKbTwo();
switch (view.getId()) {
case R.id.tv_date: {
showDialogPick(mViewBinding.tvDate);
}
break;
case R.id.rb_suspended: {
//暂停
nowStatus = 1;
}
break;
case R.id.rb_start: {
//启用
nowStatus = 0;
}
break;
case R.id.btn_add:{
if (isNull()) {
if (Integer.parseInt(mViewBinding.etRuleMoney.getText().toString()) <= Integer
.parseInt(mViewBinding.etTicketMoney.getText().toString())) {
ToastUtils.showLong("可用金额需大于优惠券面值 ");
return;
}
loadingDialog.show((BaseActivity) mContext);
if (nowType == 1) {
mPresenter.add(getUiData(), loadingDialog);
} else if (nowType == 2) {
mPresenter.truleUpdate(getUiData(), loadingDialog);
}
} else {
ToastUtils.showLong("输入数据不能null");
}
}
break;
default: {
}
break;
}
}
});
}
public void editTicketData(Trule trule) {
this.trule = trule;
}
private Trule getUiData() {
mViewBinding.tvIntegralRuleName.setText(mViewBinding.etTicketMoney.getText().toString() +
"元优惠券");
trule.setTruleName(mViewBinding.tvIntegralRuleName.getText().toString());
//0：正常 1暂停 默认0
trule.setTruleStatus(nowStatus);
trule.setTruleValAmt(ConvertUtil.yuanToFen(mViewBinding.etTicketMoney.getText().toString
()));
trule.setTruleExp(TimeUtils.string2Millis(mViewBinding.tvDate.getText().toString(), new
SimpleDateFormat("yyyy-mm-dd")));
trule.setTruleOrderAmt(ConvertUtil.yuanToFen(mViewBinding.etRuleMoney.getText().toString
()));
if (!mViewBinding.etTicketCount.getText().toString().equals("")) {
trule.setTruleUseNum(Byte.parseByte(mViewBinding.etTicketCount.getText().toString()));
} else {
trule.setTruleUseNum((byte) 1);
}
return trule;
}
/**
* 判断用户输入数据是否为null
*
* @return 输入为null返回false 反之返回true
*/
private boolean isNull() {
return !(TextUtils.isEmpty(mViewBinding.etTicketMoney.getText().toString())
|| TextUtils.isEmpty(mViewBinding.tvDate.getText().toString())
|| TextUtils.isEmpty(mViewBinding.etRuleMoney.getText().toString())
|| TextUtils.isEmpty(mViewBinding.etTicketCount.getText().toString()));
}
//将两个选择时间的dialog放在该函数中
private void showDialogPick(final View btn) {
//获取Calendar对象，用于获取当前时间
final Calendar calendar = Calendar.getInstance();
int year = calendar.get(Calendar.YEAR);
int month = calendar.get(Calendar.MONTH);
int day = calendar.get(Calendar.DAY_OF_MONTH);
//实例化DatePickerDialog对象
DatePickerDialog datePickerDialog = new DatePickerDialog(mContext, new
DatePickerDialog.OnDateSetListener() {
//选择完日期后会调用该回调函数
@Override
public void onDateSet(DatePicker view, int year, int monthOfYear, int
dayOfMonth) {
//因为monthOfYear会比实际月份少一月所以这边要加1
((TextView) btn).setText(year + "-" + (monthOfYear + 1) + "-" + dayOfMonth);
}
}, year, month, day);
//弹出选择日期对话框
datePickerDialog.show();
}
/**
* 显示软键盘，Dialog使用
*/
public void hintKbTwo() {
View view = getActivity().getCurrentFocus();
if (view == null) {
return;
}
if (view instanceof TextView) {
InputMethodManager mInputMethodManager = (InputMethodManager) getContext()
.getSystemService(Context.INPUT_METHOD_SERVICE);
mInputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), InputMethodManager
.RESULT_UNCHANGED_SHOWN);
}
}
private TextWatcher mTextWatcher = new TextWatcher() {
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
}
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
}
@Override
public void afterTextChanged(Editable s) {
String text = s.toString();
int len = s.toString().length();
if (len == 1 && text.equals("0")) {
s.clear();
}
}
};
public void setNowType(int type) {
trule = new Trule();
this.nowType = type;
}
}
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ticket/fragment/TickerIndexFragment.java 0 → 100644
View file @ b50ebd43
package com.xingdata.zzdpos.ui.marketing.ticket.fragment;
import android.support.v7.widget.LinearLayoutManager;
import android.text.Html;
import android.view.View;
import com.blankj.utilcode.util.ActivityUtils;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentTickerMainBinding;
import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Trule;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.marketing.ticket.ReturnTicketActivity;
import com.xingdata.zzdpos.ui.marketing.ticket.ReturnTicketPresenter;
import com.xingdata.zzdpos.ui.marketing.ticket.adapter.ReturnTicketAdapter;
import com.xingdata.zzdpos.util.OnClickListener;
import java.util.ArrayList;
public class TickerIndexFragment extends BaseFragment<ReturnTicketPresenter,
FragmentTickerMainBinding> {
ReturnTicketAdapter returnTicketAdapter;
LoadingDialog loadingDialog = new LoadingDialog();
@Override
public int getLayoutId() {
return R.layout.fragment_ticker_main;
}
@Override
public void initView() {
mViewBinding.icTitle.tvTitle.setText("优惠券规则");
mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
ActivityUtils.finishActivity(ReturnTicketActivity.class);
}
});
mViewBinding.btnGroup.setText(Html.fromHtml(
getResources().getString(R.string.tv_ticket_count, "<font color='#1f7bdb'><big> "
+ "0" + " " + "</big></font>")));
returnTicketAdapter = new ReturnTicketAdapter(new ArrayList<>(), mPresenter,
(ReturnTicketActivity) getActivity());
mViewBinding.rcTicket.setAdapter(returnTicketAdapter);
LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getActivity());
linearLayoutManager.setOrientation(LinearLayoutManager.VERTICAL);
mViewBinding.rcTicket.setLayoutManager(linearLayoutManager);
mViewBinding.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View view) {
switch (view.getId()) {
case R.id.btn_add: {
// mPresenter.ticketAddDialog = new TicketAddDialog();
// mPresenter.ticketAddDialog.show(this);
mPresenter.tickerAddFragment = new TickerAddFragment();
start(mPresenter.tickerAddFragment);
}
break;
default: {
}
break;
}
}
});
}
public void truleQuerySucc(Pager<Trule> trulePager, LoadingDialog loadingDialog) {
closeLoading(loadingDialog);
if (trulePager == null || trulePager.getList() == null || trulePager.getList().size() <=
0) {
mViewBinding.tvEmpty.setVisibility(View.VISIBLE);
}
if (trulePager != null && trulePager.getList() != null) {
mViewBinding.tvEmpty.setVisibility(View.GONE);
returnTicketAdapter.setNewData(trulePager.getList());
mViewBinding.btnGroup.setText(Html.fromHtml(getResources().getString(R.string
.tv_ticket_count,
"<font color='#1f7bdb'><big> " + trulePager.getList().size() + " " +
"</big></font>")));
}
}
private void closeLoading(LoadingDialog loadingDialog) {
if (loadingDialog != null) {
loadingDialog.dismiss();
}
}
}
app/src/main/java/com/xingdata/zzdpos/ui/sendTicke/SendTicketActivity.java 0 → 100644
View file @ b50ebd43
package com.xingdata.zzdpos.ui.sendTicke;
import com.blankj.utilcode.util.LogUtils;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.databinding.ActivitySendTicketBinding;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
public class SendTicketActivity extends BaseActivity<SendTicketPresenter,
ActivitySendTicketBinding>
implements SendTicketContract.View {
LoadingDialog loadingDialog = new LoadingDialog();
@Override
public int getLayoutId() {
return R.layout.activity_send_ticket;
}
@Override
public void initView() {
loadRootFragment(R.id.fragment, mPresenter.sendTickerIndexFragment);
}
@Override
public void error(String errorMsg, LoadingDialog loadingDialog) {
closeLoading(loadingDialog);
LogUtils.e(errorMsg);
ToastUtils.showLong(errorMsg);
}
private void closeLoading(LoadingDialog loadingDialog) {
if (loadingDialog != null) {
loadingDialog.dismiss();
}
}
}
app/src/main/java/com/xingdata/zzdpos/ui/sendTicke/SendTicketContract.java 0 → 100644
View file @ b50ebd43
package com.xingdata.zzdpos.ui.sendTicke;
import com.xingdata.zzdpos.base.BasePresenter;
import com.xingdata.zzdpos.base.BaseView;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
/**
* Created by Administrator on 2017/11/24.
*/
public interface SendTicketContract {
interface View extends BaseView {
void error(String errorMsg, LoadingDialog loadingDialog);
}
abstract class Presenter extends BasePresenter<View> {
}
}
app/src/main/java/com/xingdata/zzdpos/ui/sendTicke/SendTicketPresenter.java 0 → 100644
View file @ b50ebd43
package com.xingdata.zzdpos.ui.sendTicke;
import com.xingdata.zzdpos.ui.sendTicke.fragment.SendTickerIndexFragment;
/**
* Created by Administrator on 2017/11/24.
*/
public class SendTicketPresenter extends SendTicketContract.Presenter {
public SendTickerIndexFragment sendTickerIndexFragment = new SendTickerIndexFragment();
@Override
public void onAttached() {
}
}
app/src/main/java/com/xingdata/zzdpos/ui/sendTicke/fragment/SendTickerIndexFragment.java 0 → 100644
View file @ b50ebd43
package com.xingdata.zzdpos.ui.sendTicke.fragment;
import android.view.View;
import com.blankj.utilcode.util.ActivityUtils;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentSendTickerMainBinding;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.marketing.integral.IntegralActivity;
import com.xingdata.zzdpos.ui.sendTicke.SendTicketPresenter;
import com.xingdata.zzdpos.util.OnClickListener;
public class SendTickerIndexFragment extends BaseFragment<SendTicketPresenter,
FragmentSendTickerMainBinding> {
@Override
public int getLayoutId() {
return R.layout.fragment_send_ticker_main;
}
@Override
public void initView() {
mViewBinding.icTitle.tvTitle.setText("积分规则");
mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
ActivityUtils.finishActivity(IntegralActivity.class);
}
});
}
private void closeLoading(LoadingDialog loadingDialog) {
if (loadingDialog != null) {
loadingDialog.dismiss();
}
}
}
app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsActivity.java 0 → 100644
View file @ b50ebd43
package com.xingdata.zzdpos.ui.statistics;
import android.view.KeyEvent;
import com.blankj.utilcode.util.FragmentUtils;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.databinding.ActivityStatisticsBinding;
import com.xingdata.zzdpos.ui.statistics.fragment.OrderMainFragment;
import com.xingdata.zzdpos.ui.statistics.fragment.StatisticsFragment;
public class StatisticsActivity extends BaseActivity<StatisticsPresenter, ActivityStatisticsBinding> implements StatisticsContract.View {
private StatisticsFragment mStatisticsFragment = new StatisticsFragment();
private OrderMainFragment mOrderMainFragment = new OrderMainFragment();
@Override
public int getLayoutId() {
return R.layout.activity_statistics;
}
@Override
public void initView() {
FragmentUtils.add(getSupportFragmentManager(), mStatisticsFragment, mViewBinding.fragmentContainer.getId(), false, true);
}
@Override
public void showOrderListFragment() {
FragmentUtils.add(getSupportFragmentManager(), mOrderMainFragment, mViewBinding.fragmentContainer.getId(), false, true);
}
@Override
public boolean onKeyDown(int keyCode, KeyEvent event) {
// if (event.getKeyCode() == KeyEvent.KEYCODE_BACK && event.getAction() == KeyEvent.ACTION_DOWN) {
// if (getSupportFragmentManager().getBackStackEntryCount() > 1) {
// getSupportFragmentManager().popBackStack();
// }
// }
return super.onKeyDown(keyCode, event);
}
}
app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsContract.java 0 → 100644
View file @ b50ebd43
package com.xingdata.zzdpos.ui.statistics;
import com.xingdata.zzdpos.base.BasePresenter;
import com.xingdata.zzdpos.base.BaseView;
/**
* Created by Administrator on 2017/12/23.
*/
public interface StatisticsContract {
interface View extends BaseView {
void showOrderListFragment();
}
abstract class Presenter extends BasePresenter<View> {
public abstract void clickOrderList();
}
}
app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsPresenter.java 0 → 100644
View file @ b50ebd43
package com.xingdata.zzdpos.ui.statistics;
import android.view.KeyEvent;
import com.blankj.utilcode.util.FragmentUtils;
/**
* Created by Administrator on 2017/12/23.
*/
public class StatisticsPresenter extends StatisticsContract.Presenter {
@Override
public void onAttached() {
}
@Override
public void clickOrderList() {
mView.showOrderListFragment();
}
}
app/src/main/java/com/xingdata/zzdpos/ui/statistics/adapter/FragmentStateAdapter.java 0 → 100644
View file @ b50ebd43
package com.xingdata.zzdpos.ui.statistics.adapter;
import android.os.Parcelable;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentPagerAdapter;
import android.support.v4.app.FragmentStatePagerAdapter;
import java.util.List;
/**
* Created by Administrator on 2017/12/20.
*/
public class FragmentStateAdapter extends FragmentStatePagerAdapter {
private List<Fragment> fragmentList;
public FragmentStateAdapter(List<Fragment> fragmentList, FragmentManager fm) {
super(fm);
this.fragmentList = fragmentList;
}
@Override
public Fragment getItem(int position) {
return fragmentList.get(position);
}
@Override
public int getCount() {
return fragmentList.size();
}
@Override
public Parcelable saveState() {
return null;
}
}
app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/OrderListFragment.java 0 → 100644
View file @ b50ebd43
package com.xingdata.zzdpos.ui.statistics.fragment;
import com.blankj.utilcode.util.TimeUtils;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentOrderListBinding;
import com.xingdata.zzdpos.databinding.FragmentOrderMainBinding;
import com.xingdata.zzdpos.ui.main.MainPresenter;
import com.xingdata.zzdpos.ui.main.adapter.MenuRecyclerAdapter;
import java.util.Calendar;
import java.util.List;
public class OrderListFragment extends BaseFragment<MainPresenter, FragmentOrderListBinding> {
private MenuRecyclerAdapter mMenuRecyclerAdapter;
private List<Integer> integers;
private Long monthDateStart;
private Long monthDateEnd;
public OrderListFragment setDate(Long end, Long start) {
monthDateStart = start;
monthDateEnd = end;
return this;
}
@Override
public int getLayoutId() {
return R.layout.fragment_order_list;
}
@Override
public void initView() {
Calendar calendar = Calendar.getInstance();
//获得当前时间的月份，月份从0开始所以结果要加1
int monthNow = calendar.get(Calendar.MONTH) + 1;
calendar.setTimeInMillis(monthDateStart);
int monthStart = calendar.get(Calendar.MONTH) + 1;
if (monthStart == monthNow) {
mViewBinding.setMonth("本月");
} else {
mViewBinding.setMonth(monthStart + "月");
}
mViewBinding.setAmt("收入：￥230.00");
// mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
// @Override
// protected void myOnClickListener(View v) {
// getActivity().finish();
// }
// });
// mViewBinding.icTitle.tvTitle.setText(R.string.menu_statistics);
// mViewBinding.fragmentCasherRecycler.setLayoutManager(new GridLayoutManager(getActivity(), 2));
// integers = new ArrayList<>();
// integers.add(101);
// integers.add(102);
// mMenuRecyclerAdapter = new MenuRecyclerAdapter(getActivity(), integers);
// mMenuRecyclerAdapter.bindToRecyclerView(mViewBinding.fragmentCasherRecycler);
// mViewBinding.fragmentCasherRecycler.addItemDecoration(new MyMenuItemDecoration(getActivity(), 5, getResources().getColor(R.color.golden_yuji)));
// mMenuRecyclerAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
// @Override
// public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
// switch ((int) adapter.getData().get(position)) {
// case C.MENU.MENU_VIP://会员
//
// break;
// case C.MENU.MENU_RECHARGE://充值
//
// break;
// case C.MENU.MENU_MS://营销
//
// break;
// case C.MENU.MENU_TICKET://优惠券
//
// break;
// case C.MENU.MENU_STATISTICS://统计
//
// break;
// case C.MENU.MENU_MANAGER://管理
//
// break;
//
// }
// }
// });
}
}
app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/OrderMainFragment.java 0 → 100644
View file @ b50ebd43
package com.xingdata.zzdpos.ui.statistics.fragment;
import android.support.design.widget.TabLayout;
import android.support.v4.app.Fragment;
import com.blankj.utilcode.util.TimeUtils;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentOrderMainBinding;
import com.xingdata.zzdpos.ui.main.MainPresenter;
import com.xingdata.zzdpos.ui.main.adapter.FragmentViewAdapter;
import com.xingdata.zzdpos.ui.main.fragment.ServiceFragment;
import com.xingdata.zzdpos.ui.statistics.adapter.FragmentStateAdapter;
import com.xingdata.zzdpos.util.StringUtil;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
import io.reactivex.Observable;
import io.reactivex.ObservableEmitter;
import io.reactivex.ObservableOnSubscribe;
import io.reactivex.Observer;
import io.reactivex.Scheduler;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;
import io.reactivex.functions.Consumer;
import io.reactivex.functions.Function;
import io.reactivex.schedulers.Schedulers;
public class OrderMainFragment extends BaseFragment<MainPresenter, FragmentOrderMainBinding> {
private FragmentStateAdapter mFragmentStateAdapter;
private List<Long> dateLongs = new ArrayList<>();
private List<Fragment> fragments = new ArrayList<>();
private int month;
@Override
public int getLayoutId() {
return R.layout.fragment_order_main;
}
@Override
public void initView() {
initViewPager();
// mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
// @Override
// protected void myOnClickListener(View v) {
// getActivity().finish();
// }
// });
// mViewBinding.icTitle.tvTitle.setText(R.string.menu_statistics);
// mViewBinding.fragmentCasherRecycler.setLayoutManager(new GridLayoutManager(getActivity(), 2));
// integers = new ArrayList<>();
// integers.add(101);
// integers.add(102);
// mMenuRecyclerAdapter = new MenuRecyclerAdapter(getActivity(), integers);
// mMenuRecyclerAdapter.bindToRecyclerView(mViewBinding.fragmentCasherRecycler);
// mViewBinding.fragmentCasherRecycler.addItemDecoration(new MyMenuItemDecoration(getActivity(), 5, getResources().getColor(R.color.golden_yuji)));
// mMenuRecyclerAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
// @Override
// public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
// switch ((int) adapter.getData().get(position)) {
// case C.MENU.MENU_VIP://会员
//
// break;
// case C.MENU.MENU_RECHARGE://充值
//
// break;
// case C.MENU.MENU_MS://营销
//
// break;
// case C.MENU.MENU_TICKET://优惠券
//
// break;
// case C.MENU.MENU_STATISTICS://统计
//
// break;
// case C.MENU.MENU_MANAGER://管理
//
// break;
//
// }
// }
// });
}
public void initViewPager() {
if (fragments.size() == 0) {
Observable.create(new ObservableOnSubscribe<String>() {
@Override
public void subscribe(ObservableEmitter<String> e) throws Exception {
String date = TimeUtils.millis2String(System.currentTimeMillis(), new SimpleDateFormat(StringUtil.defaultDatePattern));
String[] dates = date.split("-");
int y = Integer.valueOf(dates[0]);
month = Integer.valueOf(dates[1]);
int m = month + 1;
for (int i = 0; i < 13; i++) {
if (m == 0) {
m = 12;
y--;
}
if (m == 13) {
m = 1;
y++;
}
String month = String.valueOf(m).length() >= 2 ? String.valueOf(m) : "0" + String.valueOf(m);
e.onNext(y + "-" + month + "-01");
m--;
}
e.onComplete();
}
}).subscribeOn(Schedulers.computation()).map(new Function<String, Long>() {
@Override
public Long apply(String s) throws Exception {
return TimeUtils.string2Millis(s, new SimpleDateFormat(StringUtil.defaultDatePattern));
}
}).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer<Long>() {
@Override
public void onSubscribe(Disposable d) {
}
@Override
public void onNext(Long aLong) {
dateLongs.add(aLong);
}
@Override
public void onError(Throwable e) {
ToastUtils.showShort(e.toString());
}
@Override
public void onComplete() {
for (int i = 0; i < dateLongs.size() - 1; i++) {
fragments.add(new OrderListFragment().setDate(dateLongs.get(i), dateLongs.get(i + 1)));
}
mFragmentStateAdapter = new FragmentStateAdapter(fragments, getChildFragmentManager());
mViewBinding.viewPagerData.setAdapter(mFragmentStateAdapter);
mViewBinding.viewPagerData.setCurrentItem(0);
mViewBinding.tabLayout.setupWithViewPager(mViewBinding.viewPagerData);
for (int i = 0; i < fragments.size(); i++) {
if (month == 0) month = 12;
mViewBinding.tabLayout.getTabAt(i).setText(month + "");
month--;
}
}
});
} else {
mFragmentStateAdapter = new FragmentStateAdapter(fragments, getChildFragmentManager());
mViewBinding.viewPagerData.setAdapter(mFragmentStateAdapter);
mViewBinding.tabLayout.setupWithViewPager(mViewBinding.viewPagerData);
for (int i = 0; i < fragments.size(); i++) {
if (month == 0) month = 12;
mViewBinding.tabLayout.getTabAt(i).setText(month + "");
month--;
}
mViewBinding.viewPagerData.setCurrentItem(0);
}
}
@Override
public void onStop() {
super.onStop();
}
}
app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/StatisticsFragment.java 0 → 100644
View file @ b50ebd43
package com.xingdata.zzdpos.ui.statistics.fragment;
import android.support.v7.widget.GridLayoutManager;
import android.view.View;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentStatisticsBinding;
import com.xingdata.zzdpos.ui.main.MainPresenter;
import com.xingdata.zzdpos.ui.main.adapter.MenuRecyclerAdapter;
import com.xingdata.zzdpos.ui.statistics.StatisticsPresenter;
import com.xingdata.zzdpos.util.MyMenuItemDecoration;
import com.xingdata.zzdpos.util.OnClickListener;
import java.util.ArrayList;
import java.util.List;
public class StatisticsFragment extends BaseFragment<StatisticsPresenter, FragmentStatisticsBinding> {
private MenuRecyclerAdapter mMenuRecyclerAdapter;
private List<Integer> integers;
@Override
public int getLayoutId() {
return R.layout.fragment_statistics;
}
@Override
public void initView() {
mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
getActivity().finish();
}
});
mViewBinding.icTitle.tvTitle.setText(R.string.menu_statistics);
mViewBinding.fragmentCasherRecycler.setLayoutManager(new GridLayoutManager(getActivity(), 2));
integers = new ArrayList<>();
integers.add(101);
integers.add(102);
mMenuRecyclerAdapter = new MenuRecyclerAdapter(getActivity(), integers);
mMenuRecyclerAdapter.bindToRecyclerView(mViewBinding.fragmentCasherRecycler);
mViewBinding.fragmentCasherRecycler.addItemDecoration(new MyMenuItemDecoration(getActivity(), 5, getResources().getColor(R.color.golden_yuji)));
mMenuRecyclerAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
switch ((int) adapter.getData().get(position)) {
case C.MENU.MENU_VIP://会员
mPresenter.clickOrderList();
break;
case C.MENU.MENU_RECHARGE://充值
break;
case C.MENU.MENU_MS://营销
break;
case C.MENU.MENU_TICKET://优惠券
break;
case C.MENU.MENU_STATISTICS://统计
break;
case C.MENU.MENU_MANAGER://管理
break;
}
}
});
}
}
app/src/main/java/com/xingdata/zzdpos/ui/vip/VipActivity.java 0 → 100644
View file @ b50ebd43
package com.xingdata.zzdpos.ui.vip;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.databinding.ActivityVipBinding;
import com.xingdata.zzdpos.model.Level;
import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Vip;
import com.xingdata.zzdpos.ui.vip.fragment.VipInfoFragment;
import com.xingdata.zzdpos.ui.vip.fragment.VipLevleFragment;
public class VipActivity extends BaseActivity<VipPresenter, ActivityVipBinding> implements VipContract.View {
private VipInfoFragment vipInfoFragment = new VipInfoFragment();
private VipLevleFragment vipLevleFragment = new VipLevleFragment();
@Override
public int getLayoutId() {
return R.layout.activity_vip;
}
@Override
public void initView() {
loadRootFragment(R.id.vip_level_frame, vipLevleFragment, false, false);
}
@Override
public Pager<Vip> getVipLevelSus() {
return null;
}
@Override
public Pager<Level> getVipListSus() {
return null;
}
@Override
public String getVipNumberSus() {
return null;
}
}
app/src/main/java/com/xingdata/zzdpos/ui/vip/VipContract.java 0 → 100644
View file @ b50ebd43
package com.xingdata.zzdpos.ui.vip;
import com.xingdata.zzdpos.base.BasePresenter;
import com.xingdata.zzdpos.base.BaseView;
import com.xingdata.zzdpos.model.Level;
import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Vip;
interface VipContract {
interface View extends BaseView {
Pager<Vip> getVipLevelSus();
Pager<Level> getVipListSus();
String getVipNumberSus();
}
abstract class Presenter extends BasePresenter<VipContract.View> {
public abstract void getVipList(int levelId, int pageNumber);
public abstract void getVipLevel();
public abstract void getVipNumber();
}
}
\ No newline at end of file
app/src/main/java/com/xingdata/zzdpos/ui/vip/VipPresenter.java 0 → 100644
View file @ b50ebd43
package com.xingdata.zzdpos.ui.vip;
public class VipPresenter extends VipContract.Presenter {
@Override
public void onAttached() {
}
@Override
public void getVipList(int levelId, int pageNumber) {
}
@Override
public void getVipLevel() {
}
@Override
public void getVipNumber() {
}
}
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipInfoFragment.java 0 → 100644
View file @ b50ebd43
package com.xingdata.zzdpos.ui.vip.fragment;
/**
* Created by JM_DEV on 2017/12/21.
*/
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentViplevelTitleBinding;
import com.xingdata.zzdpos.ui.vip.VipPresenter;
/**
* 会员信息界面
*/
public class VipInfoFragment extends BaseFragment<VipPresenter, FragmentViplevelTitleBinding> {
@Override
public int getLayoutId() {
return R.layout.fragment_viplevel_title;
}
@Override
public void initView() {
// RadioButton radioButton = new RadioButton(getActivity());
// radioButton.setText("AAAAAAAAAAAAAAA");
// mViewBinding.vipLevelRadioGroup.addView(radioButton);
}
}
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipLevleFragment.java 0 → 100644
View file @ b50ebd43
package com.xingdata.zzdpos.ui.vip.fragment;
/**
* Created by JM_DEV on 2017/12/21.
*/
import android.annotation.SuppressLint;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.view.Gravity;
import android.widget.GridView;
import android.widget.LinearLayout;
import android.widget.RadioButton;
import android.widget.RadioGroup;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentViplevelTitleBinding;
import com.xingdata.zzdpos.ui.vip.VipActivity;
import com.xingdata.zzdpos.ui.vip.VipPresenter;
/**
* 会员等级列表
*/
public class VipLevleFragment extends BaseFragment<VipPresenter, FragmentViplevelTitleBinding> {
@Override
public int getLayoutId() {
return R.layout.fragment_viplevel_title;
}
@Override
public void initView() {
LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT);
layoutParams.height = 120;
layoutParams.width = LinearLayout.LayoutParams.MATCH_PARENT;
for (int i = 0; i < 5; i++) {
mViewBinding.vipLevelRadioGroup.addView(addRadioButton(layoutParams));
}
setRadioButtonChecked(true, ((RadioButton) mViewBinding.vipLevelRadioGroup.getChildAt(0)));
mViewBinding.vipLevelRadioGroup.setOnCheckedChangeListener((radioGroup, n) -> {
for (int i = 0; i < mViewBinding.vipLevelRadioGroup.getChildCount(); i++) {
//动态设置按钮颜色
setRadioButtonChecked(i == n - 1, ((RadioButton) radioGroup.getChildAt(i)));
}
});
}
/**
* 设置按钮选中
*
* @param b
* @param button
*/
private void setRadioButtonChecked(boolean b, RadioButton button) {
button.getPaint().setFakeBoldText(b);//字体加粗
if (b) {
button.setTextSize(17);
} else {
button.setTextSize(15);
}
}
@SuppressLint("ResourceAsColor")
private RadioButton addRadioButton(LinearLayout.LayoutParams layoutParams) {
RadioButton radioButton = new RadioButton(getActivity());
radioButton.setTextSize(15);
radioButton.setText("金牌会员");
setRadioButtonChecked(false, radioButton);
radioButton.setGravity(Gravity.CENTER);
radioButton.setButtonDrawable(null);
radioButton.getPaint().setFakeBoldText(true);
radioButton.setBackgroundResource(R.drawable.checkbox_viplevel_bg);
radioButton.setTextColor(R.color.black_baozheng);
radioButton.setLayoutParams(layoutParams);
return radioButton;
}
}
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipListFragment.java 0 → 100644
View file @ b50ebd43
package com.xingdata.zzdpos.ui.vip.fragment;
/**
* Created by JM_DEV on 2017/12/21.
*/
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentViplevelTitleBinding;
import com.xingdata.zzdpos.ui.vip.VipPresenter;
/**
* 会员列表
*/
public class VipListFragment extends BaseFragment<VipPresenter, FragmentViplevelTitleBinding> {
@Override
public int getLayoutId() {
return R.layout.fragment_viplevel_title;
}
@Override
public void initView() {
// RadioButton radioButton = new RadioButton(getActivity());
// radioButton.setText("AAAAAAAAAAAAAAA");
// mViewBinding.vipLevelRadioGroup.addView(radioButton);
}
}
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipRecordFragment.java 0 → 100644
View file @ b50ebd43
package com.xingdata.zzdpos.ui.vip.fragment;
/**
* Created by JM_DEV on 2017/12/21.
*/
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentViplevelTitleBinding;
import com.xingdata.zzdpos.ui.vip.VipPresenter;
/**
* 会员消费充值记录
*/
public class VipRecordFragment extends BaseFragment<VipPresenter, FragmentViplevelTitleBinding> {
@Override
public int getLayoutId() {
return R.layout.fragment_viplevel_title;
}
@Override
public void initView() {
// RadioButton radioButton = new RadioButton(getActivity());
// radioButton.setText("AAAAAAAAAAAAAAA");
// mViewBinding.vipLevelRadioGroup.addView(radioButton);
}
}
app/src/main/java/com/xingdata/zzdpos/util/SystemUtil.java
View file @ b50ebd43
......@@ -55,7 +55,7 @@ public final class SystemUtil {
}
}
// return deviceSN;
return "548496";
return "92209325";
}
......
app/src/main/res/drawable/black_border.xml
View file @ b50ebd43
......@@ -3,10 +3,10 @@
<corners android:radius="@dimen/all_shape_radius" />
<stroke
android:width="0.5dp"
android:color="@color/black" />
<solid android:color="@color/all_transparent" />
</shape>
\ No newline at end of file
app/src/main/res/drawable/checkbox_viplevel_bg.xml 0 → 100644
View file @ b50ebd43
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@mipmap/vip_level_check_bg" android:state_checked="true" />
<item android:drawable="@mipmap/vip_level_bg" android:state_checked="false" />
</selector>
\ No newline at end of file
app/src/main/res/drawable/redout_border_whitein.xml 0 → 100644
View file @ b50ebd43
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" >
<corners android:radius="@dimen/all_radius" />
<stroke
android:width="0.5dp"
android:color="@color/red_guanyu" />
<solid android:color="@color/white_caocao" />
</shape>
\ No newline at end of file
app/src/main/res/drawable/selector_gradient_gray_button_background.xml
View file @ b50ebd43
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/shape_red_round_rectangle_strokeless" android:state_pressed="true" />
<item android:drawable="@drawable/red_border_allradius" android:state_pressed="true" />
<item android:drawable="@drawable/shape_gray_round_rectangle_stroke" android:state_enabled="false" />
<item android:drawable="@drawable/shape_gradient_gray_round_rectangle_stroke" />
<item android:drawable="@drawable/redout_border_whitein" />
</selector>
\ No newline at end of file
app/src/main/res/drawable/selector_gray_button_text_color.xml
View file @ b50ebd43
......@@ -2,6 +2,6 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/white" android:state_pressed="true" />
<item android:color="@color/blue" />
<item android:color="@color/red_guanyu" />
</selector>
\ No newline at end of file
app/src/main/res/drawable/shape_transparent_round.xml
View file @ b50ebd43
......@@ -2,6 +2,6 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="@dimen/settle_btn_radius" />
<solid android:color="@color/gray_transparent" />
<solid android:color="@color/white_transparent15" />
</shape>
\ No newline at end of file
app/src/main/res/layout/activity_help.xml
View file @ b50ebd43
<?xml version="1.0" encoding="utf-8"?>
<layout>
<data>
<variable
name="versionNo"
type="String" />
</data>
<android.support.constraint.ConstraintLayout 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"
......@@ -36,9 +43,10 @@
android:layout_height="0dp"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/guideline">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -70,10 +78,10 @@
android:weightSum="2">
<TextView
style="@style/textView_body"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
style="@style/textView_body"
android:text="@string/help_phone_hint" />
<TextView
......@@ -84,6 +92,7 @@
android:padding="@dimen/all_padding"
android:text="@string/help_phone" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -92,10 +101,10 @@
android:weightSum="2">
<TextView
style="@style/textView_body"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
style="@style/textView_body"
android:text="@string/help_code_hint" />
<TextView
......@@ -104,8 +113,9 @@
android:layout_weight="1"
android:gravity="right"
android:padding="@dimen/all_padding"
android:text="@string/help_web" />
android:text="@{versionNo}" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -114,10 +124,10 @@
android:weightSum="2">
<TextView
style="@style/textView_body"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
style="@style/textView_body"
android:text="@string/help_word_hint" />
<TextView
......
app/src/main/res/layout/activity_send_ticket.xml 0 → 100644
View file @ b50ebd43
<?xml version="1.0" encoding="utf-8"?>
<layout>
<data>
<variable
name="onClickListener"
type="android.view.View.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/appBack"
android:orientation="vertical">
<FrameLayout
android:id="@+id/fragment"
style="@style/xuline_margin"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:background="@color/appBack"/>
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/activity_statistics.xml 0 → 100644
View file @ b50ebd43
<?xml version="1.0" encoding="utf-8"?>
<layout>
<android.support.constraint.ConstraintLayout 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">
<FrameLayout
android:id="@+id/fragment_container"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
</FrameLayout>
</android.support.constraint.ConstraintLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/activity_vip.xml 0 → 100644
View file @ b50ebd43
This diff is collapsed.
app/src/main/res/layout/dialog_base.xml
View file @ b50ebd43
This diff is collapsed.
app/src/main/res/layout/dialog_handover.xml
View file @ b50ebd43
This diff is collapsed.
app/src/main/res/layout/fragment_casher.xml
View file @ b50ebd43
This diff is collapsed.
app/src/main/res/layout/fragment_integral_main.xml 0 → 100644
View file @ b50ebd43
This diff is collapsed.
app/src/main/res/layout/fragment_myself.xml
View file @ b50ebd43
......@@ -8,7 +8,7 @@
android:background="@color/gray_zhouyu"
tools:context="com.example.administrator.tangkupos.CasherFragment">
<!-- TODO: Update blank fragment layout -->
<!-- TODO: Update blank fragmfragment_integral_indexyout -->
<android.support.constraint.Guideline
android:id="@+id/guideline"
android:layout_width="wrap_content"
......
app/src/main/res/layout/fragment_order_list.xml 0 → 100644
View file @ b50ebd43
This diff is collapsed.
app/src/main/res/layout/fragment_order_main.xml 0 → 100644
View file @ b50ebd43
This diff is collapsed.
app/src/main/res/layout/fragment_send_ticker_main.xml 0 → 100644
View file @ b50ebd43
This diff is collapsed.
app/src/main/res/layout/fragment_statistics.xml 0 → 100644
View file @ b50ebd43
This diff is collapsed.
app/src/main/res/layout/fragment_ticker_main.xml 0 → 100644
View file @ b50ebd43
This diff is collapsed.
app/src/main/res/layout/fragment_viplevel_title.xml 0 → 100644
View file @ b50ebd43
This diff is collapsed.
app/src/main/res/layout/item_integral.xml
View file @ b50ebd43
This diff is collapsed.
app/src/main/res/layout/title.xml
View file @ b50ebd43
This diff is collapsed.
app/src/main/res/layout/title_appback.xml
View file @ b50ebd43
This diff is collapsed.
app/src/main/res/layout/title_order.xml 0 → 100644
View file @ b50ebd43
This diff is collapsed.
app/src/main/res/layout/title_search.xml 0 → 100644
View file @ b50ebd43
This diff is collapsed.
app/src/main/res/mipmap-xhdpi/add_bg.png 0 → 100644
View file @ b50ebd43
This diff is collapsed.
app/src/main/res/mipmap-xhdpi/but_return_02.png 0 → 100644
View file @ b50ebd43
This diff is collapsed.
app/src/main/res/mipmap-xhdpi/go_back.9.png 0 → 100644
View file @ b50ebd43
This diff is collapsed.
app/src/main/res/mipmap-xhdpi/scan_bg.9.png 0 → 100644
View file @ b50ebd43
This diff is collapsed.
app/src/main/res/mipmap-xhdpi/search_bg.9.png 0 → 100644
View file @ b50ebd43
This diff is collapsed.
app/src/main/res/mipmap-xhdpi/swipe_card_bg.9.png 0 → 100644
View file @ b50ebd43
This diff is collapsed.
app/src/main/res/mipmap-xhdpi/vip_level_bg.9.png 0 → 100644
View file @ b50ebd43
This diff is collapsed.
app/src/main/res/mipmap-xhdpi/vip_level_check_bg.9.png 0 → 100644
View file @ b50ebd43
This diff is collapsed.
app/src/main/res/values/colors.xml
View file @ b50ebd43
This diff is collapsed.
app/src/main/res/values/dimens.xml
View file @ b50ebd43
This diff is collapsed.
app/src/main/res/values/strings.xml
View file @ b50ebd43
This diff is collapsed.
app/src/main/res/values/styles.xml
View file @ b50ebd43
This diff is collapsed.
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