Skip to content

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

Merge remote-tracking branch 'origin/master'

parents c96a63a4 097f1459
Hide whitespace changes
Inline Side-by-side
Showing with 1618 additions and 205 deletions
.idea/dictionaries/Eurus.xml
View file @ e76a4fcd
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
<w>nong</w> <w>nong</w>
<w>patt</w> <w>patt</w>
<w>shixiu</w> <w>shixiu</w>
<w>skugrps</w>
<w>skus</w> <w>skus</w>
<w>sunquan</w> <w>sunquan</w>
<w>xishi</w> <w>xishi</w>
......
app/src/main/AndroidManifest.xml
View file @ e76a4fcd
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.xingdata.zzdpos"> package="com.xingdata.zzdpos">
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.SEND_SMS" /> <uses-permission android:name="android.permission.SEND_SMS"/>
<application <application
android:name=".App" android:name=".App"
...@@ -25,64 +25,65 @@ ...@@ -25,64 +25,65 @@
android:configChanges="keyboard|orientation|screenSize|keyboardHidden" android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
android:theme="@style/AppTheme"> android:theme="@style/AppTheme">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter> </intent-filter>
</activity> </activity>
<activity <activity
android:name=".ui.login.LoginActivity" android:name=".ui.login.LoginActivity"
android:configChanges="keyboard|orientation|screenSize|keyboardHidden" android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
android:windowSoftInputMode="adjustUnspecified|stateHidden" /> android:windowSoftInputMode="adjustUnspecified|stateHidden"/>
<activity <activity
android:name=".ui.exception.ErrorDialogActivity" android:name=".ui.exception.ErrorDialogActivity"
android:configChanges="keyboard|orientation|screenSize|keyboardHidden" android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
android:theme="@style/Theme.AppCompat.Light.Dialog" /> android:theme="@style/Theme.AppCompat.Light.Dialog"/>
<activity <activity
android:name=".ui.exception.ServerErrActivity" android:name=".ui.exception.ServerErrActivity"
android:configChanges="keyboard|orientation|screenSize|keyboardHidden" android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
android:theme="@style/Theme.AppCompat.Light.Dialog" /> android:theme="@style/Theme.AppCompat.Light.Dialog"/>
<activity <activity
android:name=".ui.payment.PaymentActivity" android:name=".ui.payment.PaymentActivity"
android:configChanges="keyboard|orientation|screenSize|keyboardHidden" android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
android:windowSoftInputMode="adjustUnspecified|stateHidden" /> android:windowSoftInputMode="adjustUnspecified|stateHidden"/>
<activity <activity
android:name=".ui.marketing.integral.IntegralActivity" android:name=".ui.marketing.integral.IntegralActivity"
android:configChanges="keyboard|orientation|screenSize|keyboardHidden" android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
android:theme="@style/AppTheme" android:theme="@style/AppTheme"
android:windowSoftInputMode="adjustUnspecified|stateHidden" /> android:windowSoftInputMode="adjustUnspecified|stateHidden"/>
<activity <activity
android:name=".ui.marketing.ticket.ReturnTicketActivity" android:name=".ui.marketing.ticket.ReturnTicketActivity"
android:configChanges="keyboard|orientation|screenSize|keyboardHidden" android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
android:label="@string/title_activity_ticket" android:label="@string/title_activity_ticket"
android:theme="@style/AppTheme" /> android:theme="@style/AppTheme"/>
<activity <activity
android:name=".ui.sendticke.SendTicketActivity" android:name=".ui.sendticke.SendTicketActivity"
android:configChanges="keyboard|orientation|screenSize|keyboardHidden" android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
android:label="@string/title_activity_ticket" android:label="@string/title_activity_ticket"
android:theme="@style/AppTheme" /> android:theme="@style/AppTheme"/>
<activity <activity
android:name=".ui.settle.SettleActivity" android:name=".ui.settle.SettleActivity"
android:configChanges="keyboard|orientation|screenSize|keyboardHidden" android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
android:windowSoftInputMode="adjustUnspecified|stateHidden" /> android:windowSoftInputMode="adjustUnspecified|stateHidden"/>
<activity <activity
android:name=".ui.store.StoreActivity" android:name=".ui.store.StoreActivity"
android:configChanges="keyboard|orientation|screenSize|keyboardHidden" android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
android:windowSoftInputMode="adjustUnspecified|stateHidden" /> android:windowSoftInputMode="adjustUnspecified|stateHidden"/>
<activity <activity
android:name=".ui.announcement.AnnouncementActivity" android:name=".ui.announcement.AnnouncementActivity"
android:configChanges="keyboard|orientation|screenSize|keyboardHidden" android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:theme="@style/AppTheme" android:theme="@style/AppTheme"
android:windowSoftInputMode="adjustUnspecified|stateHidden" /> android:windowSoftInputMode="adjustUnspecified|stateHidden"/>
<activity android:name=".ui.help.HelpActivity" /> <activity android:name=".ui.help.HelpActivity"/>
<activity android:name=".ui.feedback.FeedBackActivity" /> <activity android:name=".ui.feedback.FeedBackActivity"/>
<activity android:name=".ui.statistics.StatisticsActivity"></activity> <activity android:name=".ui.statistics.StatisticsActivity"/>
<activity <activity
android:name=".ui.vip.VipActivity" android:name=".ui.vip.VipActivity"
android:configChanges="keyboard|orientation|screenSize|keyboardHidden" android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
android:windowSoftInputMode="adjustUnspecified|stateHidden" /> android:windowSoftInputMode="adjustUnspecified|stateHidden"/>
<activity android:name=".ui.marketing.marketingMenu.MarketingMenuActivity">
</activity>
</application> </application>
</manifest> </manifest>
\ No newline at end of file
app/src/main/java/com/xingdata/zzdpos/C.java
View file @ e76a4fcd
...@@ -255,6 +255,8 @@ public class C { ...@@ -255,6 +255,8 @@ public class C {
private static final String ROOT_URL = PKG + "ticket/"; private static final String ROOT_URL = PKG + "ticket/";
public static final String query = ROOT_URL + "query"; public static final String query = ROOT_URL + "query";
public static final String ticketBatchSend = ROOT_URL + "batchSend";
} }
public final class SSSKU { public final class SSSKU {
......
app/src/main/java/com/xingdata/zzdpos/api/ApiFactory.java
View file @ e76a4fcd
...@@ -557,7 +557,8 @@ public final class ApiFactory { ...@@ -557,7 +557,8 @@ public final class ApiFactory {
.retryWhen(new RetryHelper(3)); .retryWhen(new RetryHelper(3));
} }
public static Observable<com.xingdata.zzdpos.model.Saleorder> addOrderPayMis(com.xingdata.zzdpos.model.Saleorder.Pay saleorderPay) { public static Observable<com.xingdata.zzdpos.model.Saleorder> addOrderPayMis(com.xingdata
.zzdpos.model.Saleorder.Pay saleorderPay) {
return Api.getInstance().service.addOrderPayMis(saleorderPay) return Api.getInstance().service.addOrderPayMis(saleorderPay)
.onErrorReturn(new ErrorFilter<>()) .onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>()) .map(new ResultFilter<>())
...@@ -577,6 +578,16 @@ public final class ApiFactory { ...@@ -577,6 +578,16 @@ public final class ApiFactory {
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3)); .retryWhen(new RetryHelper(3));
} }
public static Observable<String> batchSend(String birthdayType, String vipLevel, Long
vipId, Long truleId) {
return Api.getInstance().service.ticketBatchSend(birthdayType, vipLevel, vipId, truleId)
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
}
} }
public static class Sssku { public static class Sssku {
...@@ -700,7 +711,8 @@ public final class ApiFactory { ...@@ -700,7 +711,8 @@ public final class ApiFactory {
* @param pageSize * @param pageSize
* @return * @return
*/ */
public static Observable<Pager<com.xingdata.zzdpos.model.Cs>> querCsList(int pageNulmber, int public static Observable<Pager<com.xingdata.zzdpos.model.Cs>> querCsList(int pageNulmber,
int
pageSize, long startDate, long endDate) { pageSize, long startDate, long endDate) {
return Api.getInstance().service.querCsList(pageNulmber, pageSize, startDate, return Api.getInstance().service.querCsList(pageNulmber, pageSize, startDate,
endDate).onErrorReturn(new endDate).onErrorReturn(new
...@@ -933,7 +945,8 @@ public final class ApiFactory { ...@@ -933,7 +945,8 @@ public final class ApiFactory {
} }
public static Observable<com.xingdata.zzdpos.model.Ms> add(com.xingdata.zzdpos.model.Ms ms) { public static Observable<com.xingdata.zzdpos.model.Ms> add(com.xingdata.zzdpos.model.Ms
ms) {
return Api.getInstance().service.addMs(ms) return Api.getInstance().service.addMs(ms)
.onErrorReturn(new ErrorFilter<>()) .onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>()) .map(new ResultFilter<>())
......
app/src/main/java/com/xingdata/zzdpos/api/ApiService.java
View file @ e76a4fcd
...@@ -136,7 +136,8 @@ interface ApiService { ...@@ -136,7 +136,8 @@ interface ApiService {
@POST(C.URL.ORDER.queryOrderList) @POST(C.URL.ORDER.queryOrderList)
Observable<HttpMessage<Pager<Saleorder>>> getSaleOrder(@Query("pageNumber") int pageNum, @Query Observable<HttpMessage<Pager<Saleorder>>> getSaleOrder(@Query("pageNumber") int pageNum, @Query
("pageSize") int pageSize, @Query("startDate") long startDate, @Query("endDate") long endDate); ("pageSize") int pageSize, @Query("startDate") long startDate, @Query("endDate") long
endDate);
@POST(C.URL.ORDER.getOrderDetail) @POST(C.URL.ORDER.getOrderDetail)
Observable<HttpMessage<Saleorder>> getOrderDetail(@Query("id") String orderId); Observable<HttpMessage<Saleorder>> getOrderDetail(@Query("id") String orderId);
...@@ -197,6 +198,12 @@ interface ApiService { ...@@ -197,6 +198,12 @@ interface ApiService {
@POST(C.URL.TICKET.query) @POST(C.URL.TICKET.query)
Observable<HttpMessage<Pager<Ticket>>> queryTicket(@Query("vipId") Long vipId); Observable<HttpMessage<Pager<Ticket>>> queryTicket(@Query("vipId") Long vipId);
@POST(C.URL.TICKET.ticketBatchSend)
Observable<HttpMessage<String>> ticketBatchSend(@Query("birthdayType") String birthdayType,
@Query("vipLevel") String vipLevel,
@Query("vipId") Long vipId,
@Query("truleId") Long truleId);
@POST(C.URL.SALEORDER.addOrderMis) @POST(C.URL.SALEORDER.addOrderMis)
Observable<HttpMessage<String>> addOrderMis(@Body Saleorder.Param saleorderParam); Observable<HttpMessage<String>> addOrderMis(@Body Saleorder.Param saleorderParam);
......
app/src/main/java/com/xingdata/zzdpos/base/BaseDialog.java
View file @ e76a4fcd
...@@ -14,6 +14,7 @@ import android.view.ViewGroup; ...@@ -14,6 +14,7 @@ import android.view.ViewGroup;
import android.view.Window; import android.view.Window;
import android.view.WindowManager; import android.view.WindowManager;
import com.blankj.utilcode.util.ActivityUtils;
import com.blankj.utilcode.util.KeyboardUtils; import com.blankj.utilcode.util.KeyboardUtils;
import com.blankj.utilcode.util.LogUtils; import com.blankj.utilcode.util.LogUtils;
import com.blankj.utilcode.util.ScreenUtils; import com.blankj.utilcode.util.ScreenUtils;
...@@ -76,13 +77,17 @@ public abstract class BaseDialog<P extends BasePresenter, B extends ViewDataBind ...@@ -76,13 +77,17 @@ public abstract class BaseDialog<P extends BasePresenter, B extends ViewDataBind
mBaseBinding.btnConfirm.setEnabled(isEnable); mBaseBinding.btnConfirm.setEnabled(isEnable);
} }
public int getTitle() { public int getTitle() {
return R.string.all_dialog; return R.string.all_dialog;
} }
@Override @Override
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle
savedInstanceState) {
getDialog().requestWindowFeature(Window.FEATURE_NO_TITLE); getDialog().requestWindowFeature(Window.FEATURE_NO_TITLE);
mContext = ActivityUtils.getTopActivity();
mPresenter = (P) getBaseActivity().mPresenter; mPresenter = (P) getBaseActivity().mPresenter;
getBaseActivity().mDialogs.add(0, this); getBaseActivity().mDialogs.add(0, this);
......
app/src/main/java/com/xingdata/zzdpos/base/BaseSelectedAdapter.java
View file @ e76a4fcd
...@@ -38,7 +38,7 @@ public abstract class BaseSelectedAdapter<T, B extends ViewDataBinding> extends ...@@ -38,7 +38,7 @@ public abstract class BaseSelectedAdapter<T, B extends ViewDataBinding> extends
notifyItemChanged(mSelectedPosition); notifyItemChanged(mSelectedPosition);
notifyItemChanged(position); notifyItemChanged(position);
mSelectedPosition = position; mSelectedPosition = position;
if (!this.isAutoClickItem) { if (mOnItemClickListener != null && !this.isAutoClickItem) {
mOnItemClickListener.onItemClick(this, view, mSelectedPosition); mOnItemClickListener.onItemClick(this, view, mSelectedPosition);
} }
}); });
......
app/src/main/java/com/xingdata/zzdpos/base/BaseSheetDialog.java
View file @ e76a4fcd
...@@ -17,6 +17,7 @@ import android.view.WindowManager; ...@@ -17,6 +17,7 @@ import android.view.WindowManager;
public abstract class BaseSheetDialog<P extends BasePresenter, B extends ViewDataBinding> extends BaseDialog<P, B> { public abstract class BaseSheetDialog<P extends BasePresenter, B extends ViewDataBinding> extends BaseDialog<P, B> {
public BottomSheetBehavior mBehavior; public BottomSheetBehavior mBehavior;
@NonNull @NonNull
@Override @Override
public Dialog onCreateDialog(Bundle savedInstanceState) { public Dialog onCreateDialog(Bundle savedInstanceState) {
...@@ -27,11 +28,18 @@ public abstract class BaseSheetDialog<P extends BasePresenter, B extends ViewDat ...@@ -27,11 +28,18 @@ public abstract class BaseSheetDialog<P extends BasePresenter, B extends ViewDat
MyBottomSheetDialog dialog = new MyBottomSheetDialog(mContext); MyBottomSheetDialog dialog = new MyBottomSheetDialog(mContext);
mViewBinding = DataBindingUtil.inflate(LayoutInflater.from(mContext), getLayoutId(), null, false); mViewBinding = DataBindingUtil.inflate(LayoutInflater.from(mContext), getLayoutId(), null, false);
dialog.setContentView(mViewBinding.getRoot()); dialog.setContentView(mViewBinding.getRoot());
if (isTransparentBackground()) {
((View) mViewBinding.getRoot().getParent()).setBackgroundColor(getResources().getColor(android.R.color.transparent));
}
mBehavior = BottomSheetBehavior.from((View) mViewBinding.getRoot().getParent()); mBehavior = BottomSheetBehavior.from((View) mViewBinding.getRoot().getParent());
this.initView(); this.initView();
return dialog; return dialog;
} }
protected boolean isTransparentBackground() {
return false;
}
@Override @Override
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
return null; return null;
...@@ -39,7 +47,8 @@ public abstract class BaseSheetDialog<P extends BasePresenter, B extends ViewDat ...@@ -39,7 +47,8 @@ public abstract class BaseSheetDialog<P extends BasePresenter, B extends ViewDat
private class MyBottomSheetDialog extends BottomSheetDialog { private class MyBottomSheetDialog extends BottomSheetDialog {
public MyBottomSheetDialog(@NonNull Context context) {
private MyBottomSheetDialog(@NonNull Context context) {
super(context); super(context);
} }
...@@ -50,7 +59,7 @@ public abstract class BaseSheetDialog<P extends BasePresenter, B extends ViewDat ...@@ -50,7 +59,7 @@ public abstract class BaseSheetDialog<P extends BasePresenter, B extends ViewDat
getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, screenHeight == 0 ? ViewGroup.LayoutParams.MATCH_PARENT : screenHeight); getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, screenHeight == 0 ? ViewGroup.LayoutParams.MATCH_PARENT : screenHeight);
} }
int getScreenHeight(Context context) { private int getScreenHeight(Context context) {
WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE); WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
return wm != null ? wm.getDefaultDisplay().getHeight() : 0; return wm != null ? wm.getDefaultDisplay().getHeight() : 0;
} }
......
app/src/main/java/com/xingdata/zzdpos/db/DBFactory.java
View file @ e76a4fcd
package com.xingdata.zzdpos.db; package com.xingdata.zzdpos.db;
import com.blankj.utilcode.util.StringUtils;
import com.xingdata.zzdpos.App; import com.xingdata.zzdpos.App;
import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.base.BaseModel; import com.xingdata.zzdpos.base.BaseModel;
import com.xingdata.zzdpos.model.HandoverInfo; import com.xingdata.zzdpos.model.HandoverInfo;
import com.xingdata.zzdpos.model.Ms; import com.xingdata.zzdpos.model.Ms;
import com.xingdata.zzdpos.model.Pay; import com.xingdata.zzdpos.model.Pay;
import com.xingdata.zzdpos.model.Sskugrp; import com.xingdata.zzdpos.model.Sskugrp;
import com.xingdata.zzdpos.model.Sssku;
import com.xingdata.zzdpos.ui.main.MainPresenter; import com.xingdata.zzdpos.ui.main.MainPresenter;
import com.xingdata.zzdpos.ui.settle.SettlePresenter; import com.xingdata.zzdpos.ui.settle.SettlePresenter;
import com.xingdata.zzdpos.ui.store.StorePresenter; import com.xingdata.zzdpos.ui.store.StorePresenter;
import com.xingdata.zzdpos.util.StringUtil;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -50,6 +54,49 @@ public class DBFactory { ...@@ -50,6 +54,49 @@ public class DBFactory {
public static class Store { public static class Store {
/**
* 分页查询商品
*
* @param pageNum 页面
* @param skuGrpId 分组ID
* @return 商品List
*/
public static Observable<List<Sssku>> querySku(int pageNum, Long skuGrpId) {
RealmQuery<Sssku> query = DB.getInstance().get(MainPresenter.class).where(Sssku.class);
//skuGrpId
if (skuGrpId != null && skuGrpId > 0) query.equalTo("skuGrpId", skuGrpId);
//skuStatus
query.equalTo("skuStatus", 0);
return Observable.just(query.findAll()).flatMap(ssskus -> Observable.just(getLimitList(ssskus, pageNum, C.PRODUCT.PAGE_SIZE)));
}
/**
* 分页查询商品
*
* @param pageNum 页面
* @param keyword 关键字
* @return 商品List
*/
public static Observable<List<Sssku>> querySku(int pageNum, String keyword) {
RealmQuery<Sssku> query = DB.getInstance().get(MainPresenter.class).where(Sssku.class);
long _keyword = StringUtil.strToLong(keyword);
//keyword
if (!StringUtils.isEmpty(keyword)) {
query.beginGroup()
.contains("spuName", keyword)
.or().contains("spuAb", keyword.toUpperCase());
if (_keyword > 0) query.or().equalTo("spuBarcode", _keyword);
query.endGroup();
}
//skuStatus
query.equalTo("skuStatus", 0);
return Observable.just(query.findAll()).flatMap(ssskus -> Observable.just(getLimitList(ssskus, pageNum, C.PRODUCT.PAGE_SIZE)));
}
/** /**
* 查询商品分组 * 查询商品分组
* *
......
app/src/main/java/com/xingdata/zzdpos/model/MarketingMenuModel.java 0 → 100644
View file @ e76a4fcd
package com.xingdata.zzdpos.model;
/**
* Created by Administrator on 2017/12/27.
*/
public class MarketingMenuModel {
private String MarketingMenuName;
private int MarketingMenuImg;
public String getMarketingMenuName() {
return MarketingMenuName;
}
public void setMarketingMenuName(String marketingMenuName) {
MarketingMenuName = marketingMenuName;
}
public int getMarketingMenuImg() {
return MarketingMenuImg;
}
public void setMarketingMenuImg(int marketingMenuImg) {
MarketingMenuImg = marketingMenuImg;
}
}
app/src/main/java/com/xingdata/zzdpos/ui/dialog/LoadingDialog.java
View file @ e76a4fcd
...@@ -4,24 +4,14 @@ package com.xingdata.zzdpos.ui.dialog; ...@@ -4,24 +4,14 @@ package com.xingdata.zzdpos.ui.dialog;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.os.Bundle; import android.os.Bundle;
import com.blankj.utilcode.util.LogUtils;
import java.util.concurrent.TimeUnit;
import io.reactivex.Observable;
import io.reactivex.Observer;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.annotations.NonNull;
import io.reactivex.disposables.Disposable;
import io.reactivex.functions.Consumer;
import io.reactivex.functions.Function;
import com.xingdata.zzdpos.R; import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity; import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.base.BaseDialog; import com.xingdata.zzdpos.base.BaseDialog;
import com.xingdata.zzdpos.base.BasePresenter; import com.xingdata.zzdpos.base.BasePresenter;
import com.xingdata.zzdpos.databinding.DialogLoadingBinding; import com.xingdata.zzdpos.databinding.DialogLoadingBinding;
import io.reactivex.disposables.Disposable;
public class LoadingDialog extends BaseDialog<BasePresenter, DialogLoadingBinding> { public class LoadingDialog extends BaseDialog<BasePresenter, DialogLoadingBinding> {
Disposable disp; Disposable disp;
boolean isClose = true; boolean isClose = true;
...@@ -55,49 +45,9 @@ public class LoadingDialog extends BaseDialog<BasePresenter, DialogLoadingBindin ...@@ -55,49 +45,9 @@ public class LoadingDialog extends BaseDialog<BasePresenter, DialogLoadingBindin
@Override @Override
public void show(BaseActivity activity) { public void show(BaseActivity activity) {
super.show(activity); super.show(activity, 20);
if (isClose) {
int recLen = 20;
Observable.interval(0, 1, TimeUnit.SECONDS).take(recLen + 1).map(new Function<Long,
Long>
() {
@Override
public Long apply(@NonNull Long aLong) throws Exception {
return recLen - aLong;
}
}).observeOn(AndroidSchedulers.mainThread()).doOnSubscribe(new Consumer<Disposable>() {
@Override
public void accept(Disposable disposable) throws Exception {
disp = disposable;
}
}).subscribe(new Observer<Long>() {
@Override
public void onSubscribe(@NonNull Disposable d) {
disp = d;
}
@Override
public void onNext(@NonNull Long aLong) {
LogUtils.e("对话框将在" + aLong + "S后关闭");
}
@Override
public void onError(@NonNull Throwable e) {
}
@Override
public void onComplete() {
dismiss();
if (null != disp) {
disp.dispose();
}
}
});
}
} }
@Override @Override
public void onDismiss(DialogInterface dialog) { public void onDismiss(DialogInterface dialog) {
super.onDismiss(dialog); super.onDismiss(dialog);
......
app/src/main/java/com/xingdata/zzdpos/ui/main/fragment/CasherFragment.java
View file @ e76a4fcd
...@@ -12,6 +12,7 @@ import com.xingdata.zzdpos.base.BaseFragment; ...@@ -12,6 +12,7 @@ import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentCasherBinding; import com.xingdata.zzdpos.databinding.FragmentCasherBinding;
import com.xingdata.zzdpos.ui.main.MainPresenter; import com.xingdata.zzdpos.ui.main.MainPresenter;
import com.xingdata.zzdpos.ui.main.adapter.MenuRecyclerAdapter; import com.xingdata.zzdpos.ui.main.adapter.MenuRecyclerAdapter;
import com.xingdata.zzdpos.ui.marketing.marketingMenu.MarketingMenuActivity;
import com.xingdata.zzdpos.ui.payment.PaymentActivity; import com.xingdata.zzdpos.ui.payment.PaymentActivity;
import com.xingdata.zzdpos.ui.statistics.StatisticsActivity; import com.xingdata.zzdpos.ui.statistics.StatisticsActivity;
import com.xingdata.zzdpos.ui.store.StoreActivity; import com.xingdata.zzdpos.ui.store.StoreActivity;
...@@ -59,10 +60,12 @@ public class CasherFragment extends BaseFragment<MainPresenter, FragmentCasherBi ...@@ -59,10 +60,12 @@ public class CasherFragment extends BaseFragment<MainPresenter, FragmentCasherBi
break; break;
case C.MENU.MENU_MS://营销 case C.MENU.MENU_MS://营销
ActivityUtils.startActivity(new Intent(getActivity(),
MarketingMenuActivity.class));
break; break;
case C.MENU.MENU_TICKET://优惠券 case C.MENU.MENU_TICKET://优惠券
ActivityUtils.startActivity(getActivity(), com.xingdata.zzdpos.ui.sendticke.SendTicketActivity.class); ActivityUtils.startActivity(getActivity(), com.xingdata.zzdpos.ui
.sendticke.SendTicketActivity.class);
break; break;
case C.MENU.MENU_STATISTICS://统计 case C.MENU.MENU_STATISTICS://统计
ActivityUtils.startActivity(getActivity(), StatisticsActivity.class); ActivityUtils.startActivity(getActivity(), StatisticsActivity.class);
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/marketingMenu/MarketingMenuActivity.java 0 → 100644
View file @ e76a4fcd
package com.xingdata.zzdpos.ui.marketing.marketingMenu;
import android.databinding.DataBindingUtil;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.LinearLayoutManager;
import android.view.View;
import com.blankj.utilcode.util.ActivityUtils;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.databinding.ActivityMarketingMenuBinding;
import com.xingdata.zzdpos.model.MarketingMenuModel;
import com.xingdata.zzdpos.ui.marketing.integral.IntegralActivity;
import com.xingdata.zzdpos.ui.marketing.marketingMenu.adapter.MarketingMenuAdapter;
import com.xingdata.zzdpos.ui.marketing.ticket.ReturnTicketActivity;
import com.xingdata.zzdpos.util.OnClickListener;
import java.util.ArrayList;
import java.util.List;
public class MarketingMenuActivity extends AppCompatActivity {
MarketingMenuAdapter marketingMenuAdapter;
List<MarketingMenuModel> list = new ArrayList<>();
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_marketing_menu);
ActivityMarketingMenuBinding mViewBinding = DataBindingUtil.setContentView(
this, R.layout.activity_marketing_menu);
mViewBinding.icTitle.tvTitle.setText("营销设置");
mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
ActivityUtils.finishActivity(MarketingMenuActivity.class);
}
});
MarketingMenuModel marketingMenuModel1 = new MarketingMenuModel();
MarketingMenuModel marketingMenuModel2 = new MarketingMenuModel();
MarketingMenuModel marketingMenuModel3 = new MarketingMenuModel();
MarketingMenuModel marketingMenuModel4 = new MarketingMenuModel();
MarketingMenuModel marketingMenuModel5 = new MarketingMenuModel();
MarketingMenuModel marketingMenuModel6 = new MarketingMenuModel();
marketingMenuModel1.setMarketingMenuImg(R.mipmap.vip_level);
marketingMenuModel1.setMarketingMenuName("会员等级");
marketingMenuModel2.setMarketingMenuImg(R.mipmap.integral_rules);
marketingMenuModel2.setMarketingMenuName("积分规则");
marketingMenuModel3.setMarketingMenuImg(R.mipmap.ticker_setting);
marketingMenuModel3.setMarketingMenuName("优惠券设置");
marketingMenuModel4.setMarketingMenuImg(R.mipmap.top_up_preferential);
marketingMenuModel4.setMarketingMenuName("充值优惠");
marketingMenuModel5.setMarketingMenuImg(R.mipmap.marketing_plan);
marketingMenuModel5.setMarketingMenuName("营销计划");
marketingMenuModel6.setMarketingMenuImg(R.mipmap.sms_all);
marketingMenuModel6.setMarketingMenuName("群发短信");
list.add(marketingMenuModel1);
list.add(marketingMenuModel2);
list.add(marketingMenuModel3);
list.add(marketingMenuModel4);
list.add(marketingMenuModel5);
list.add(marketingMenuModel6);
marketingMenuAdapter = new MarketingMenuAdapter(list);
mViewBinding.rvMenu.setAdapter(marketingMenuAdapter);
LinearLayoutManager linearLayoutManager = new LinearLayoutManager(this);
linearLayoutManager.setOrientation(linearLayoutManager.VERTICAL);
mViewBinding.rvMenu.setLayoutManager(linearLayoutManager);
marketingMenuAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
switch (position) {
case 0: {
//会员等级
}
break;
case 1: {
//积分规则
ActivityUtils.startActivity(IntegralActivity.class);
}
break;
case 2: {
//优惠券设置
ActivityUtils.startActivity(ReturnTicketActivity.class);
}
break;
case 3: {
//充值优惠
}
break;
case 4: {
//营销计划
}
break;
case 5: {
//群发短信
}
break;
default: {
}
break;
}
}
});
}
}
app/src/main/java/com/xingdata/zzdpos/ui/marketing/marketingMenu/adapter/MarketingMenuAdapter.java 0 → 100644
View file @ e76a4fcd
package com.xingdata.zzdpos.ui.marketing.marketingMenu.adapter;
import android.support.annotation.Nullable;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseAdapter;
import com.xingdata.zzdpos.databinding.ItemMarketingMenuBinding;
import com.xingdata.zzdpos.model.MarketingMenuModel;
import java.util.List;
/**
* Created by Administrator on 2017/11/24.
*/
public class MarketingMenuAdapter extends BaseAdapter<MarketingMenuModel, ItemMarketingMenuBinding> {
public MarketingMenuAdapter(@Nullable List<MarketingMenuModel> data) {
super(R.layout.item_marketing_menu, data);
}
@Override
protected void convert(ItemMarketingMenuBinding mViewBinding, MarketingMenuModel item) {
mViewBinding.ivLogo.setImageResource(item.getMarketingMenuImg());
mViewBinding.tvMenuName.setText(item.getMarketingMenuName());
}
}
app/src/main/java/com/xingdata/zzdpos/ui/sendticke/SendTickerC.java
View file @ e76a4fcd
...@@ -40,5 +40,15 @@ public class SendTickerC { ...@@ -40,5 +40,15 @@ public class SendTickerC {
return vipTypeList; return vipTypeList;
} }
public static Long getServerId(long id) {
if (id == 10001l) {
return 1l;
} else if (id == 10002l) {
return 2l;
} else if (id == 10003l) {
return 3l;
}
return -1l;
}
} }
app/src/main/java/com/xingdata/zzdpos/ui/sendticke/SendTicketActivity.java
View file @ e76a4fcd
...@@ -50,10 +50,17 @@ public class SendTicketActivity extends BaseActivity<SendTicketPresenter, ...@@ -50,10 +50,17 @@ public class SendTicketActivity extends BaseActivity<SendTicketPresenter,
mPresenter.sendTickerFragment.truleQuerySucc(trulePager, loadingDialog); mPresenter.sendTickerFragment.truleQuerySucc(trulePager, loadingDialog);
} }
@Override
public void sendTickerSucc(LoadingDialog loadingDialog) {
closeLoading(loadingDialog);
mPresenter.sendTickerFragment.sendSucc();
}
@Override @Override
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
} }
private void closeLoading(LoadingDialog loadingDialog) { private void closeLoading(LoadingDialog loadingDialog) {
if (loadingDialog != null) { if (loadingDialog != null) {
loadingDialog.dismiss(); loadingDialog.dismiss();
......
app/src/main/java/com/xingdata/zzdpos/ui/sendticke/SendTicketContract.java
View file @ e76a4fcd
...@@ -33,6 +33,8 @@ public interface SendTicketContract { ...@@ -33,6 +33,8 @@ public interface SendTicketContract {
void loadVip(Vip vip); void loadVip(Vip vip);
void truleQuerySucc(Pager<Trule> trulePager, LoadingDialog loadingDialog); void truleQuerySucc(Pager<Trule> trulePager, LoadingDialog loadingDialog);
void sendTickerSucc( LoadingDialog loadingDialog);
} }
abstract class Presenter extends BasePresenter<View> { abstract class Presenter extends BasePresenter<View> {
...@@ -52,5 +54,7 @@ public interface SendTicketContract { ...@@ -52,5 +54,7 @@ public interface SendTicketContract {
abstract void truleQuery(LoadingDialog loadingDialog); abstract void truleQuery(LoadingDialog loadingDialog);
abstract void sendTicker(String birthdayType, String vipLevel, Long
vipId, Long truleId, LoadingDialog loadingDialog);
} }
} }
app/src/main/java/com/xingdata/zzdpos/ui/sendticke/SendTicketPresenter.java
View file @ e76a4fcd
...@@ -5,6 +5,7 @@ import com.xingdata.zzdpos.model.Vip; ...@@ -5,6 +5,7 @@ import com.xingdata.zzdpos.model.Vip;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog; import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.sendticke.fragment.SendTickerFragment; import com.xingdata.zzdpos.ui.sendticke.fragment.SendTickerFragment;
import com.xingdata.zzdpos.ui.sendticke.fragment.SendTickerIndexFragment; import com.xingdata.zzdpos.ui.sendticke.fragment.SendTickerIndexFragment;
import com.xingdata.zzdpos.ui.sendticke.fragment.SendTickerSuccFragment;
import com.xingdata.zzdpos.ui.sendticke.fragment.VipFragment; import com.xingdata.zzdpos.ui.sendticke.fragment.VipFragment;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -18,6 +19,7 @@ public class SendTicketPresenter extends SendTicketContract.Presenter { ...@@ -18,6 +19,7 @@ public class SendTicketPresenter extends SendTicketContract.Presenter {
public SendTickerIndexFragment sendTickerIndexFragment = new SendTickerIndexFragment(); public SendTickerIndexFragment sendTickerIndexFragment = new SendTickerIndexFragment();
public VipFragment vipFragment = new VipFragment(); public VipFragment vipFragment = new VipFragment();
public SendTickerFragment sendTickerFragment = new SendTickerFragment(); public SendTickerFragment sendTickerFragment = new SendTickerFragment();
public SendTickerSuccFragment sendTickerSuccFragment = new SendTickerSuccFragment();
/** /**
* 当前会员 * 当前会员
*/ */
...@@ -54,4 +56,14 @@ public class SendTicketPresenter extends SendTicketContract.Presenter { ...@@ -54,4 +56,14 @@ public class SendTicketPresenter extends SendTicketContract.Presenter {
mView.error(throwable.getMessage(), loadingDialog); mView.error(throwable.getMessage(), loadingDialog);
}); });
} }
@Override
public void sendTicker(String birthdayType, String vipLevel, Long vipId, Long truleId,
LoadingDialog loadingDialog) {
ApiFactory.Ticket.batchSend(birthdayType, vipLevel, vipId, truleId).subscribe(s -> {
mView.sendTickerSucc(loadingDialog);
}, throwable -> {
mView.error(throwable.getMessage(), loadingDialog);
});
}
} }
app/src/main/java/com/xingdata/zzdpos/ui/sendticke/fragment/SendTickerFragment.java
View file @ e76a4fcd
...@@ -87,15 +87,43 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter, ...@@ -87,15 +87,43 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
break; break;
case R.id.btn_send: { case R.id.btn_send: {
if (isNull()) { if (isNull()) {
ToastUtils.showLong("发券"); long tickerId = truleList
.get(nowTickerItemId).getTruleMapId();
loadingDialog.show((BaseActivity) getActivity());
if (nowtype == 0) {
//单独会员发券
mPresenter.sendTicker(null, null, nowVip.getVipId(), tickerId,
loadingDialog);
} else if (nowtype == 1) {
Long tempLevelId = levelList.get(nowVipGroupId).getId();
if (tempLevelId == SendTickerC.getVipType().get(0).getId()) {
//选择全部会员
mPresenter.sendTicker(null, null, null, tickerId,
loadingDialog);
return;
}
for (int i = 1; i < SendTickerC.getVipType().size(); i++) {
long tempServerId = SendTickerC.getServerId(tempLevelId);
//选择 当月下月以及流失会员
if (tempLevelId == SendTickerC.getVipType().get(i).getId() &&
tempServerId != -1) {
mPresenter.sendTicker(tempServerId + "", null,
null, tickerId,
loadingDialog);
return;
}
}
//选择金牌银牌等会员类别
mPresenter.sendTicker(null, levelList.get(nowVipGroupId)
.getVipLevel() + "",
null, tickerId,
loadingDialog);
}
} }
} }
break;
default: {
}
break;
} }
} }
}); });
...@@ -160,9 +188,11 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter, ...@@ -160,9 +188,11 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
SendTickerC.getVipType().get(0).setSelect(true); SendTickerC.getVipType().get(0).setSelect(true);
levelList.add(SendTickerC.getVipType().get(0)); levelList.add(SendTickerC.getVipType().get(0));
for (int i = 0; i < levels.size(); i++) { for (int i = 0; i < levels.size(); i++) {
levels.get(i).setSelect(false);
levelList.add(levels.get(i)); levelList.add(levels.get(i));
} }
for (int i = 1; i < SendTickerC.getVipType().size(); i++) { for (int i = 1; i < SendTickerC.getVipType().size(); i++) {
SendTickerC.getVipType().get(i).setSelect(false);
levelList.add(SendTickerC.getVipType().get(i)); levelList.add(SendTickerC.getVipType().get(i));
} }
mViewBinding.tvSelect.setText(levelList.get(nowVipGroupId).getVipLevelName()); mViewBinding.tvSelect.setText(levelList.get(nowVipGroupId).getVipLevelName());
...@@ -226,4 +256,17 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter, ...@@ -226,4 +256,17 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
} }
return true; return true;
} }
public void sendSucc() {
mPresenter.sendTickerSuccFragment = new SendTickerSuccFragment();
if (nowtype == 0) {
mPresenter.sendTickerSuccFragment.setUiData(truleList
.get(nowTickerItemId).getTruleName(), nowVip.getVipName());
}else {
mPresenter.sendTickerSuccFragment.setUiData(truleList
.get(nowTickerItemId).getTruleName(), levelList.get(nowVipGroupId).getVipLevelName());
}
startWithPop(mPresenter.sendTickerSuccFragment);
}
} }
\ No newline at end of file
app/src/main/java/com/xingdata/zzdpos/ui/sendticke/fragment/SendTickerIndexFragment.java
View file @ e76a4fcd
...@@ -8,6 +8,7 @@ import com.xingdata.zzdpos.base.BaseFragment; ...@@ -8,6 +8,7 @@ import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentSendTickerMainBinding; import com.xingdata.zzdpos.databinding.FragmentSendTickerMainBinding;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog; import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.marketing.integral.IntegralActivity; import com.xingdata.zzdpos.ui.marketing.integral.IntegralActivity;
import com.xingdata.zzdpos.ui.sendticke.SendTicketActivity;
import com.xingdata.zzdpos.ui.sendticke.SendTicketPresenter; import com.xingdata.zzdpos.ui.sendticke.SendTicketPresenter;
import com.xingdata.zzdpos.util.OnClickListener; import com.xingdata.zzdpos.util.OnClickListener;
...@@ -25,7 +26,7 @@ public class SendTickerIndexFragment extends BaseFragment<SendTicketPresenter, ...@@ -25,7 +26,7 @@ public class SendTickerIndexFragment extends BaseFragment<SendTicketPresenter,
mViewBinding.icTitle.setOnClickListener(new OnClickListener() { mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
@Override @Override
protected void myOnClickListener(View v) { protected void myOnClickListener(View v) {
ActivityUtils.finishActivity(IntegralActivity.class); ActivityUtils.finishActivity(SendTicketActivity.class);
} }
}); });
mViewBinding.setOnClickListener(new OnClickListener() { mViewBinding.setOnClickListener(new OnClickListener() {
......
app/src/main/java/com/xingdata/zzdpos/ui/sendticke/fragment/SendTickerSuccFragment.java 0 → 100644
View file @ e76a4fcd
package com.xingdata.zzdpos.ui.sendticke.fragment;
import android.view.View;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentSendSuccTickerBinding;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.sendticke.SendTicketPresenter;
import com.xingdata.zzdpos.util.OnClickListener;
public class SendTickerSuccFragment extends BaseFragment<SendTicketPresenter,
FragmentSendSuccTickerBinding> {
String tickerName, sendUser;
@Override
public int getLayoutId() {
return R.layout.fragment_send_succ_ticker;
}
@Override
public void initView() {
mViewBinding.icTitle.tvTitle.setText("发券成功");
mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
mPresenter.sendTickerIndexFragment = new SendTickerIndexFragment();
startWithPop(mPresenter.sendTickerIndexFragment);
}
});
mViewBinding.tvTickerName.setText(tickerName);
mViewBinding.tvSendTickerUser.setText(sendUser);
mViewBinding.tvSendTickerTime.setText(com.blankj.utilcode.util.TimeUtils.getNowString());
mViewBinding.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
mPresenter.sendTickerIndexFragment = new SendTickerIndexFragment();
startWithPop(mPresenter.sendTickerIndexFragment);
}
});
}
private void closeLoading(LoadingDialog loadingDialog) {
if (loadingDialog != null) {
loadingDialog.dismiss();
}
}
public void setUiData(String tickerName, String sendUser) {
this.tickerName = tickerName;
this.sendUser = sendUser;
}
}
\ No newline at end of file
app/src/main/java/com/xingdata/zzdpos/ui/store/StoreActivity.java
View file @ e76a4fcd
...@@ -8,12 +8,30 @@ import com.xingdata.zzdpos.base.BaseActivity; ...@@ -8,12 +8,30 @@ import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.base.BaseSku; import com.xingdata.zzdpos.base.BaseSku;
import com.xingdata.zzdpos.databinding.ActivityStoreBinding; import com.xingdata.zzdpos.databinding.ActivityStoreBinding;
import com.xingdata.zzdpos.model.Ms; import com.xingdata.zzdpos.model.Ms;
import com.xingdata.zzdpos.model.Saledetail;
import com.xingdata.zzdpos.model.Saleorder;
import com.xingdata.zzdpos.model.Sskugrp; import com.xingdata.zzdpos.model.Sskugrp;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.store.dialog.CartDialog;
import com.xingdata.zzdpos.ui.store.dialog.MsDialog;
import com.xingdata.zzdpos.ui.store.fragment.ScanFragment;
import com.xingdata.zzdpos.ui.store.fragment.SearchFragment;
import com.xingdata.zzdpos.ui.store.fragment.StoreFragment;
import java.util.List; import java.util.List;
public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBinding> implements StoreContract.View { public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBinding> implements StoreContract.View {
private StoreFragment mStoreFragment = new StoreFragment();
private SearchFragment mSearchFragment = new SearchFragment();
private ScanFragment mScanFragment = new ScanFragment();
private CartDialog mCartDialog = new CartDialog();
private MsDialog mMsDialog = new MsDialog();
private LoadingDialog mLoadingDialog = new LoadingDialog();
@Override @Override
public int getLayoutId() { public int getLayoutId() {
return R.layout.activity_store; return R.layout.activity_store;
...@@ -21,6 +39,8 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin ...@@ -21,6 +39,8 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin
@Override @Override
public void initView() { public void initView() {
loadRootFragment(R.id.f_store, mStoreFragment);
mViewBinding.ivCart.setOnClickListener(view -> mPresenter.clickCartLogo()); mViewBinding.ivCart.setOnClickListener(view -> mPresenter.clickCartLogo());
mViewBinding.tvSettle.setOnClickListener(view -> mPresenter.clickSettle()); mViewBinding.tvSettle.setOnClickListener(view -> mPresenter.clickSettle());
...@@ -33,13 +53,19 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin ...@@ -33,13 +53,19 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin
}); });
} }
@Override @Override
public <Sku extends BaseSku> void loadSkus(List<Sku> skus, boolean isRefresh) { public <Sku extends BaseSku> void loadSkus(List<Sku> skus, boolean isRefresh) {
mStoreFragment.loadSkus(skus, isRefresh);
} }
@Override @Override
public void loadSkugrps(List<Sskugrp> sskugrps) { public void loadSkugrps(List<Sskugrp> sskugrps) {
mStoreFragment.loadSkugrps(sskugrps);
}
@Override
public void loadSkugrpState(Long skugrpId) {
} }
...@@ -52,4 +78,35 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin ...@@ -52,4 +78,35 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin
public <Sku extends BaseSku> void loadSearchResult(List<Sku> skus, boolean isRefresh) { public <Sku extends BaseSku> void loadSearchResult(List<Sku> skus, boolean isRefresh) {
} }
@Override
public void loadSaleorder(Saleorder saleorder) {
mViewBinding.setCartCount(saleorder.getOrderCnt());
mViewBinding.setOrderPayAmt(saleorder.getOrderPayAmt());
mViewBinding.setMsDisAmt(saleorder.getMsDisAmt());
if (mCartDialog.isShowing) mCartDialog.loadSaleorder(saleorder);
}
@Override
public void loadSaledetails(List<Saledetail> saledetails, boolean isRefresh) {
mStoreFragment.loadSaledetails(saledetails, isRefresh);
}
@Override
public void showLoadingDialog() {
mLoadingDialog.show(this);
}
@Override
public void dismissLoadingDialog() {
mLoadingDialog.dismiss();
}
@Override
public void showCartDialog(Saleorder saleorder, List<Saledetail> saledetails) {
mCartDialog.setSaleorder(saleorder).setSaledetails(saledetails).show(this);
}
} }
app/src/main/java/com/xingdata/zzdpos/ui/store/StoreContract.java
View file @ e76a4fcd
...@@ -5,6 +5,7 @@ import com.xingdata.zzdpos.base.BaseSku; ...@@ -5,6 +5,7 @@ import com.xingdata.zzdpos.base.BaseSku;
import com.xingdata.zzdpos.base.BaseView; import com.xingdata.zzdpos.base.BaseView;
import com.xingdata.zzdpos.model.Ms; import com.xingdata.zzdpos.model.Ms;
import com.xingdata.zzdpos.model.Saledetail; import com.xingdata.zzdpos.model.Saledetail;
import com.xingdata.zzdpos.model.Saleorder;
import com.xingdata.zzdpos.model.Sskugrp; import com.xingdata.zzdpos.model.Sskugrp;
import java.util.List; import java.util.List;
...@@ -28,6 +29,13 @@ interface StoreContract { ...@@ -28,6 +29,13 @@ interface StoreContract {
*/ */
void loadSkugrps(List<Sskugrp> sskugrps); void loadSkugrps(List<Sskugrp> sskugrps);
/**
* 加载分组选中状态
*
* @param skugrpId 分组ID
*/
void loadSkugrpState(Long skugrpId);
/** /**
* 加载营销方案 * 加载营销方案
* *
...@@ -44,6 +52,39 @@ interface StoreContract { ...@@ -44,6 +52,39 @@ interface StoreContract {
*/ */
<Sku extends BaseSku> void loadSearchResult(List<Sku> skus, boolean isRefresh); <Sku extends BaseSku> void loadSearchResult(List<Sku> skus, boolean isRefresh);
/**
* 加载订单信息
*
* @param saleorder 订单信息
*/
void loadSaleorder(Saleorder saleorder);
/**
* 加载购物车信息
*
* @param saledetails 购物详情列表
* @param isRefresh 是否刷新列表
*/
void loadSaledetails(List<Saledetail> saledetails, boolean isRefresh);
/**
* 显示读取对话框
*/
void showLoadingDialog();
/**
* 隐藏读取对话框
*/
void dismissLoadingDialog();
/**
* 显示购物车
*
* @param saleorder 订单信息
* @param saledetails 购物车信息
*/
void showCartDialog(Saleorder saleorder, List<Saledetail> saledetails);
} }
abstract class Presenter extends BasePresenter<View> { abstract class Presenter extends BasePresenter<View> {
...@@ -78,6 +119,11 @@ interface StoreContract { ...@@ -78,6 +119,11 @@ interface StoreContract {
*/ */
public abstract void searchSku(String keyword); public abstract void searchSku(String keyword);
/**
* 搜索页面 - 加载更多搜索结果
*/
public abstract void loadMoreSearchResult();
/** /**
* 商店页面 - 切换分组 * 商店页面 - 切换分组
* *
...@@ -101,21 +147,16 @@ interface StoreContract { ...@@ -101,21 +147,16 @@ interface StoreContract {
*/ */
public abstract <Sku extends BaseSku> void clickRemoveSku(Sku sku); public abstract <Sku extends BaseSku> void clickRemoveSku(Sku sku);
/** /**
* 购物车页面 - 点击添加购物信息 * 购物车页面 - 购物车发生变化
*
* @param saledetail 购物信息
*/ */
public abstract void clickAddSaledetail(Saledetail saledetail); public abstract void cartChanged();
/** /**
* 购物车页面 - 点击删除购物信息 * 购物车列表 - 关闭
*
* @param saledetail 购物信息
*/ */
public abstract void clickRemoveSaledetail(Saledetail saledetail); public abstract void onCartDialogCancel();
} }
} }
app/src/main/java/com/xingdata/zzdpos/ui/store/StorePresenter.java
View file @ e76a4fcd
...@@ -4,11 +4,24 @@ import com.xingdata.zzdpos.base.BaseSku; ...@@ -4,11 +4,24 @@ import com.xingdata.zzdpos.base.BaseSku;
import com.xingdata.zzdpos.db.DBFactory; import com.xingdata.zzdpos.db.DBFactory;
import com.xingdata.zzdpos.model.Ms; import com.xingdata.zzdpos.model.Ms;
import com.xingdata.zzdpos.model.Saledetail; import com.xingdata.zzdpos.model.Saledetail;
import com.xingdata.zzdpos.model.Saleorder;
import com.xingdata.zzdpos.model.Sskugrp; import com.xingdata.zzdpos.model.Sskugrp;
import com.xingdata.zzdpos.model.Vip;
import java.util.ArrayList;
import java.util.List; import java.util.List;
public class StorePresenter extends StoreContract.Presenter { public class StorePresenter extends StoreContract.Presenter {
/**
* 当前会员
*/
private Vip mVip;
/**
* 当前订单信息
*/
private Saleorder mSaleorder;
/** /**
* 当前购物车信息 * 当前购物车信息
*/ */
...@@ -28,6 +41,10 @@ public class StorePresenter extends StoreContract.Presenter { ...@@ -28,6 +41,10 @@ public class StorePresenter extends StoreContract.Presenter {
@Override @Override
public void onAttached() { public void onAttached() {
this.initRealm(); this.initRealm();
mVip = Vip.createDefault();
mSaledetails = new ArrayList<>();
mSaleorder = new Saleorder();
} }
@Override @Override
...@@ -36,22 +53,40 @@ public class StorePresenter extends StoreContract.Presenter { ...@@ -36,22 +53,40 @@ public class StorePresenter extends StoreContract.Presenter {
@Override @Override
public void clickCartLogo() { public void clickCartLogo() {
mView.showCartDialog(mSaleorder, mSaledetails);
} }
@Override @Override
public void initStore() { public void initStore() {
this.getSkugrp();
this.refreshSku();
} }
@Override @Override
public void refreshSku() { public void refreshSku() {
this.mStorePageNum = 0;
this.mSkuGrpId = 0L;
mView.loadSkugrpState(mSkuGrpId);
this.getStoreSku();
} }
@Override @Override
public void loadMoreSku() { public void loadMoreSku() {
this.mStorePageNum++;
this.getStoreSku();
} }
@Override @Override
public void searchSku(String keyword) { public void searchSku(String keyword) {
this.mSearchPageNum = 0;
this.mKeyword = keyword;
this.getSearchSku();
}
@Override
public void loadMoreSearchResult() {
this.mSearchPageNum++;
this.getSearchSku();
} }
@Override @Override
...@@ -60,21 +95,46 @@ public class StorePresenter extends StoreContract.Presenter { ...@@ -60,21 +95,46 @@ public class StorePresenter extends StoreContract.Presenter {
@Override @Override
public <Sku extends BaseSku> void clickAddSku(Sku sku) { public <Sku extends BaseSku> void clickAddSku(Sku sku) {
//更新购物车信息
updateCart(sku, 1);
//发送购物车信息(不需要刷新页面)
mView.loadSaledetails(mSaledetails, false);
//设置订单信息
mSaleorder.setSaledetails(mSaledetails);
//统计订单信息
this.reprice();
} }
@Override @Override
public <Sku extends BaseSku> void clickRemoveSku(Sku sku) { public <Sku extends BaseSku> void clickRemoveSku(Sku sku) {
//更新购物车信息
updateCart(sku, -1);
//发送购物车信息(不需要刷新页面)
mView.loadSaledetails(mSaledetails, false);
//设置订单信息
mSaleorder.setSaledetails(mSaledetails);
//统计订单信息
this.reprice();
} }
@Override @Override
public void clickAddSaledetail(Saledetail saledetail) { public void cartChanged() {
//设置订单信息
mSaleorder.setSaledetails(mSaledetails);
//统计订单信息
this.reprice();
} }
@Override @Override
public void clickRemoveSaledetail(Saledetail saledetail) { public void onCartDialogCancel() {
//发送购物车信息并刷新页面
mView.loadSaledetails(mSaledetails, true);
} }
/**
* 获取商品分组
*/
private void getSkugrp() { private void getSkugrp() {
mCompositeDisposable.add( mCompositeDisposable.add(
DBFactory.Store.querySkugrp().subscribe( DBFactory.Store.querySkugrp().subscribe(
...@@ -95,4 +155,64 @@ public class StorePresenter extends StoreContract.Presenter { ...@@ -95,4 +155,64 @@ public class StorePresenter extends StoreContract.Presenter {
}) })
); );
} }
/**
* 搜索商品
*/
private void getStoreSku() {
mView.showLoadingDialog();
mCompositeDisposable.add(
DBFactory.Store.querySku(mStorePageNum, mSkuGrpId)
.doOnSubscribe(subscription -> mView.dismissLoadingDialog())
.subscribe(ssskus -> mView.loadSkus(ssskus, mStorePageNum == 0))
);
}
/**
* 搜索商品
*/
private void getSearchSku() {
mView.showLoadingDialog();
mCompositeDisposable.add(
DBFactory.Store.querySku(mSearchPageNum, mKeyword)
.doOnSubscribe(subscription -> mView.dismissLoadingDialog())
.subscribe(ssskus -> mView.loadSearchResult(ssskus, mSearchPageNum == 0))
);
}
/**
* 操作购物车商品
*
* @param sku 要操作的商品
* @param value 变化的数量
*/
private <T extends BaseSku> void updateCart(T sku, int value) {
for (int i = 0; i < mSaledetails.size(); i++) {
if (sku.getSkuId().longValue() == mSaledetails.get(i).getSkuId()) {
int count = mSaledetails.get(i).getDetailCnt() + value;
if (count > 0) {
mSaledetails.get(i).setCount(mSaledetails.get(i).getDetailCnt() + value);
} else {
mSaledetails.remove(i);
}
return;
}
}
if (value > 0) {
Saledetail saledetail = Saledetail.create(sku, mVip);
saledetail.setDetailCnt(value);
mSaledetails.add(0, saledetail);
}
}
/**
* 统计订单信息
*/
private void reprice() {
mSaleorder.settle();
mView.loadSaleorder(mSaleorder);
}
} }
app/src/main/java/com/xingdata/zzdpos/ui/store/adapter/SaledetailAdapter.java 0 → 100644
View file @ e76a4fcd
package com.xingdata.zzdpos.ui.store.adapter;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseAdapter;
import com.xingdata.zzdpos.base.BaseViewHolder;
import com.xingdata.zzdpos.databinding.ItemStoreSaledetailBinding;
import com.xingdata.zzdpos.model.Saledetail;
import com.xingdata.zzdpos.ui.store.dialog.CartDialog;
import com.xingdata.zzdpos.util.ConvertUtil;
import java.util.List;
public class SaledetailAdapter extends BaseAdapter<Saledetail, ItemStoreSaledetailBinding> {
public SaledetailAdapter(List<Saledetail> saledetails) {
super(R.layout.item_store_saledetail, saledetails);
}
private CartDialog.OnCountChangeListener mOnCountChangeListener;
public void setOnCountChangeListener(CartDialog.OnCountChangeListener onCountChangeListener) {
this.mOnCountChangeListener = onCountChangeListener;
}
@Override
protected void convert(ItemStoreSaledetailBinding mViewBinding, Saledetail item) {
mViewBinding.tvName.setText(item.getSpuName());
mViewBinding.tvPrice.setText(ConvertUtil.fenToYuan(item.getSkuPricePay(), true));
mViewBinding.ivIncrease.setOnClickListener(view -> {
if (mViewBinding.getCount() >= 99) return;
mViewBinding.setCount(mViewBinding.getCount() + 1);
mViewBinding.ivIncrease.setImageResource(mViewBinding.getCount() > 0 ? R.mipmap.but_increase01 : R.mipmap.but_increase02);
if (mOnCountChangeListener != null) {
mOnCountChangeListener.onCountChange(item, 1);
}
});
mViewBinding.ivReduce.setOnClickListener(view -> {
mViewBinding.setCount(mViewBinding.getCount() - 1);
mViewBinding.ivIncrease.setImageResource(mViewBinding.getCount() > 0 ? R.mipmap.but_increase01 : R.mipmap.but_increase02);
if (mOnCountChangeListener != null) {
mOnCountChangeListener.onCountChange(item, -1);
}
});
mViewBinding.setCount(item.getDetailCnt());
mViewBinding.ivIncrease.setImageResource(mViewBinding.getCount() > 0 ? R.mipmap.but_increase01 : R.mipmap.but_increase02);
}
@Override
protected void convert(BaseViewHolder helper, Saledetail item) {
super.convert(helper, item);
}
}
app/src/main/java/com/xingdata/zzdpos/ui/store/adapter/SkuAdapter.java
View file @ e76a4fcd
package com.xingdata.zzdpos.ui.store.adapter; package com.xingdata.zzdpos.ui.store.adapter;
import android.support.annotation.Nullable;
import android.view.View;
import com.xingdata.zzdpos.R; import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseAdapter; import com.xingdata.zzdpos.base.BaseAdapter;
import com.xingdata.zzdpos.base.BaseSku; import com.xingdata.zzdpos.base.BaseSku;
import com.xingdata.zzdpos.databinding.ItemStoreSkuBinding; import com.xingdata.zzdpos.databinding.ItemStoreSkuBinding;
import com.xingdata.zzdpos.model.Saledetail;
import com.xingdata.zzdpos.ui.store.fragment.StoreFragment;
import com.xingdata.zzdpos.util.ConvertUtil;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List;
public class SkuAdapter<T extends BaseSku> extends BaseAdapter<T, ItemStoreSkuBinding> { public class SkuAdapter<T extends BaseSku> extends BaseAdapter<T, ItemStoreSkuBinding> {
private List<Saledetail> mSaledetails;
public SkuAdapter() { public SkuAdapter() {
super(R.layout.item_store_sku, new ArrayList<>()); super(R.layout.item_store_sku, new ArrayList<>());
this.mSaledetails = new ArrayList<>();
}
private StoreFragment.OnCountChangeListener mOnCountChangeListener;
public void setSaledetails(List<Saledetail> saledetails) {
this.mSaledetails = saledetails;
}
public void setOnCountChangeListener(StoreFragment.OnCountChangeListener onCountChangeListener) {
this.mOnCountChangeListener = onCountChangeListener;
} }
@Override @Override
protected void convert(ItemStoreSkuBinding mViewBinding, T item) { protected void convert(ItemStoreSkuBinding mViewBinding, T item) {
mViewBinding.ivPic.setImageURI(item.getSpuImg());
mViewBinding.tvName.setText(item.getSpuName());
mViewBinding.tvAmt.setText(ConvertUtil.fenToYuan(item.getSkuRetailPrice1()));
mViewBinding.ivIncrease.setOnClickListener(view -> {
if (mViewBinding.getCount() >= 99) return;
mViewBinding.setCount(mViewBinding.getCount() + 1);
setViewByCount(mViewBinding);
if (mOnCountChangeListener != null) {
mOnCountChangeListener.onCountChange(item, 1);
}
});
mViewBinding.ivReduce.setOnClickListener(view -> {
mViewBinding.setCount(mViewBinding.getCount() - 1);
setViewByCount(mViewBinding);
if (mOnCountChangeListener != null) {
mOnCountChangeListener.onCountChange(item, -1);
}
});
mViewBinding.setCount(0);
for (int i = 0; i < mSaledetails.size(); i++) {
if (mSaledetails.get(i).getSkuId().longValue() == item.getSkuId()) {
mViewBinding.setCount(mSaledetails.get(i).getDetailCnt());
break;
}
}
setViewByCount(mViewBinding);
}
private void setViewByCount(ItemStoreSkuBinding mViewBinding) {
if (mViewBinding.getCount() > 0) {
mViewBinding.ivIncrease.setImageResource(R.mipmap.but_increase01);
mViewBinding.ivReduce.setVisibility(View.VISIBLE);
mViewBinding.tvCount.setVisibility(View.VISIBLE);
} else {
mViewBinding.ivIncrease.setImageResource(R.mipmap.but_increase02);
mViewBinding.ivReduce.setVisibility(View.GONE);
mViewBinding.tvCount.setVisibility(View.GONE);
}
} }
@Override
public void setOnItemClickListener(@Nullable OnItemClickListener listener) {
super.setOnItemClickListener(listener);
}
} }
app/src/main/java/com/xingdata/zzdpos/ui/store/adapter/SkugrpAdapter.java
View file @ e76a4fcd
...@@ -16,6 +16,8 @@ public class SkugrpAdapter extends BaseSelectedAdapter<Sskugrp, ItemStoreSkugrpB ...@@ -16,6 +16,8 @@ public class SkugrpAdapter extends BaseSelectedAdapter<Sskugrp, ItemStoreSkugrpB
@Override @Override
protected void convert(BaseViewHolder helper, ItemStoreSkugrpBinding mViewBinding, Sskugrp item) { protected void convert(BaseViewHolder helper, ItemStoreSkugrpBinding mViewBinding, Sskugrp item) {
mViewBinding.setSelected(getSelectedPosition() == helper.getAdapterPosition());
mViewBinding.tvName.getPaint().setFakeBoldText(getSelectedPosition() == helper.getAdapterPosition());
mViewBinding.tvName.setText(item.getSkuGrpName());
} }
} }
app/src/main/java/com/xingdata/zzdpos/ui/store/dialog/CartDialog.java
View file @ e76a4fcd
package com.xingdata.zzdpos.ui.store.dialog; package com.xingdata.zzdpos.ui.store.dialog;
import android.content.DialogInterface;
import android.support.v7.widget.LinearLayoutManager;
import com.xingdata.zzdpos.R; import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseSheetDialog; import com.xingdata.zzdpos.base.BaseSheetDialog;
import com.xingdata.zzdpos.databinding.DialogStoreCartBinding; import com.xingdata.zzdpos.databinding.DialogStoreCartBinding;
import com.xingdata.zzdpos.model.Saledetail;
import com.xingdata.zzdpos.model.Saleorder;
import com.xingdata.zzdpos.ui.store.StorePresenter; import com.xingdata.zzdpos.ui.store.StorePresenter;
import com.xingdata.zzdpos.ui.store.adapter.SaledetailAdapter;
import java.util.List;
public class CartDialog extends BaseSheetDialog<StorePresenter, DialogStoreCartBinding> { public class CartDialog extends BaseSheetDialog<StorePresenter, DialogStoreCartBinding> {
private Saleorder mSaleorder;
private List<Saledetail> mSaledetails;
public interface OnCountChangeListener {
void onCountChange(Saledetail saledetail, int value);
}
@Override
protected boolean isTransparentBackground() {
return true;
}
@Override @Override
public int getLayoutId() { public int getLayoutId() {
return R.layout.dialog_store_cart; return R.layout.dialog_store_cart;
...@@ -15,6 +35,57 @@ public class CartDialog extends BaseSheetDialog<StorePresenter, DialogStoreCartB ...@@ -15,6 +35,57 @@ public class CartDialog extends BaseSheetDialog<StorePresenter, DialogStoreCartB
@Override @Override
public void initView() { public void initView() {
this.loadSaleorder(mSaleorder);
// init C
SaledetailAdapter mSaledetailAdapter = new SaledetailAdapter(mSaledetails);
mViewBinding.rlCart.setAdapter(mSaledetailAdapter);
mViewBinding.rlCart.setLayoutManager(new LinearLayoutManager(mContext));
// set C listener
mSaledetailAdapter.setOnCountChangeListener((saledetail, value) -> {
for (int i = 0; i < mSaledetails.size(); i++) {
if (mSaledetails.get(i).getSkuId().longValue() == saledetail.getSkuId()) {
int count = mSaledetails.get(i).getDetailCnt() + value;
if (count > 0) {
mSaledetails.get(i).setCount(mSaledetails.get(i).getDetailCnt() + value);
} else {
mSaledetailAdapter.remove(i);
}
mPresenter.cartChanged();
break;
}
}
});
}
/**
* 加载订单信息
*
* @param saleorder 订单信息
*/
public void loadSaleorder(Saleorder saleorder) {
mViewBinding.setCartCount(saleorder.getOrderCnt());
mViewBinding.setOrderPayAmt(saleorder.getOrderPayAmt());
mViewBinding.setMsDisAmt(saleorder.getMsDisAmt());
if (saleorder.getOrderCnt() == 0) this.dismiss();
}
public CartDialog setSaleorder(Saleorder saleorder) {
this.mSaleorder = saleorder;
return this;
}
public CartDialog setSaledetails(List<Saledetail> saledetails) {
this.mSaledetails = saledetails;
return this;
}
@Override
public void onDismiss(DialogInterface dialog) {
super.onDismiss(dialog);
mPresenter.onCartDialogCancel();
} }
} }
app/src/main/java/com/xingdata/zzdpos/ui/store/fragment/StoreFragment.java
View file @ e76a4fcd
package com.xingdata.zzdpos.ui.store.fragment; package com.xingdata.zzdpos.ui.store.fragment;
import android.annotation.SuppressLint;
import android.support.v7.widget.LinearLayoutManager;
import android.view.View;
import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.R; import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment; import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.base.BaseSku;
import com.xingdata.zzdpos.databinding.FragmentStoreBinding; import com.xingdata.zzdpos.databinding.FragmentStoreBinding;
import com.xingdata.zzdpos.model.Saledetail;
import com.xingdata.zzdpos.model.Sskugrp;
import com.xingdata.zzdpos.ui.store.StorePresenter; import com.xingdata.zzdpos.ui.store.StorePresenter;
import com.xingdata.zzdpos.ui.store.adapter.SkuAdapter; import com.xingdata.zzdpos.ui.store.adapter.SkuAdapter;
import com.xingdata.zzdpos.ui.store.adapter.SkugrpAdapter; import com.xingdata.zzdpos.ui.store.adapter.SkugrpAdapter;
import java.util.List;
public class StoreFragment extends BaseFragment<StorePresenter, FragmentStoreBinding> { public class StoreFragment extends BaseFragment<StorePresenter, FragmentStoreBinding> {
private SkuAdapter mSkuAdapter; private SkuAdapter mSkuAdapter;
private SkugrpAdapter mSkugrpAdapter; private SkugrpAdapter mSkugrpAdapter;
public interface OnCountChangeListener {
void onCountChange(BaseSku sku, int value);
}
@Override @Override
public int getLayoutId() { public int getLayoutId() {
return R.layout.fragment_store_search; return R.layout.fragment_store;
} }
@Override @Override
public void initView() { public void initView() {
// init sku
mSkuAdapter = new SkuAdapter<>();
mViewBinding.rlSku.setAdapter(mSkuAdapter);
mViewBinding.rlSku.setLayoutManager(new LinearLayoutManager(mContext));
// init skugrp
mSkugrpAdapter = new SkugrpAdapter();
mViewBinding.rlSkugrp.setAdapter(mSkugrpAdapter);
mViewBinding.rlSkugrp.setLayoutManager(new LinearLayoutManager(mContext));
// set sku listener
mViewBinding.srlSku.setOnRefreshListener(this::refreshSku);
mSkuAdapter.setOnLoadMoreListener(this::loadMoreSku, mViewBinding.rlSku);
mSkuAdapter.setOnCountChangeListener((sku, value) -> {
if (value > 0) mPresenter.clickAddSku(sku);
else mPresenter.clickRemoveSku(sku);
});
// set grp listener
mSkugrpAdapter.setOnItemClickListener((adapter, view, position) -> mPresenter.clickSkugrp(mSkugrpAdapter.getData().get(position)));
// set empty
@SuppressLint("InflateParams") View view = getLayoutInflater().inflate(R.layout.view_empty, null);
mSkuAdapter.setEmptyView(view);
mSkuAdapter.isUseEmpty(false);
// init data
mPresenter.initStore(); mPresenter.initStore();
} }
/**
* 刷新商品
*/
private void refreshSku() {
mSkuAdapter.setEnableLoadMore(false);
mPresenter.refreshSku();
}
/**
* 加载更多商品
*/
private void loadMoreSku() {
mPresenter.loadMoreSku();
}
/**
* 加载商品分组
*
* @param sskugrps 商品分组
*/
public void loadSkugrps(List<Sskugrp> sskugrps) {
mSkugrpAdapter.setNewData(sskugrps);
}
/**
* 加载商品
*
* @param skus 商品
* @param isRefresh 是否刷新
* @param <Sku> 商品类型
*/
public <Sku extends BaseSku> void loadSkus(List<Sku> skus, boolean isRefresh) {
if (isRefresh) {
mSkuAdapter.isUseEmpty(true);
mSkuAdapter.setEnableLoadMore(true);
mViewBinding.srlSku.setRefreshing(false);
mSkuAdapter.setNewData(skus);
} else if (skus.size() > 0) mSkuAdapter.addData(skus);
if (skus.size() < C.PRODUCT.PAGE_SIZE) mSkuAdapter.loadMoreEnd(isRefresh);
else mSkuAdapter.loadMoreComplete();
}
/**
* 加载购物车信息
*
* @param saledetails 购物车信息
*/
public void loadSaledetails(List<Saledetail> saledetails, boolean isRefresh) {
mSkuAdapter.setSaledetails(saledetails);
if (isRefresh) mSkuAdapter.notifyDataSetChanged();
}
} }
app/src/main/res/layout/activity_marketing_menu.xml 0 → 100644
View file @ e76a4fcd
<?xml version="1.0" encoding="utf-8"?>
<layout>
<data>
<variable
name="OnClickListener"
type="com.xingdata.zzdpos.util.OnClickListener"></variable>
</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"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="com.xingdata.zzdpos.ui.marketing.marketingMenu.MarketingMenuActivity">
<include
android:id="@+id/ic_title"
layout="@layout/title"
app:layout_constraintBottom_toTopOf="@+id/rv_menu"/>
<android.support.v7.widget.RecyclerView
android:id="@+id/rv_menu"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ic_title"></android.support.v7.widget.RecyclerView>
</android.support.constraint.ConstraintLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/dialog_store_cart.xml
View file @ e76a4fcd
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"> <layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<LinearLayout <data>
android:layout_width="wrap_content"
<import type="android.view.View" />
<import type="com.xingdata.zzdpos.util.ConvertUtil" />
<variable
name="cartCount"
type="int" />
<variable
name="orderPayAmt"
type="long" />
<variable
name="msDisAmt"
type="long" />
</data>
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/transparent_border" android:background="@color/transparent"
android:gravity="center" android:gravity="center"
android:orientation="vertical"> android:orientation="vertical">
</LinearLayout>
<LinearLayout
android:id="@+id/ll_title"
android:layout_width="0dp"
android:layout_height="?attr/actionBarSize"
android:background="@color/white_caocao"
android:gravity="center_vertical|end"
android:paddingEnd="@dimen/all_margin"
android:paddingStart="@dimen/all_margin"
app:layout_constraintBottom_toTopOf="@id/rl_cart"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent">
<TextView
android:id="@+id/tv_clear"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:foreground="?android:attr/selectableItemBackground"
android:paddingBottom="@dimen/all_spacing"
android:paddingEnd="@dimen/all_margin_big"
android:paddingStart="@dimen/all_margin_big"
android:paddingTop="@dimen/all_spacing"
android:text="@string/store_btn_settle"
android:textColor="@color/white_caocao" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:background="@color/gray_huanggai"
app:layout_constraintBottom_toTopOf="@id/rl_cart" />
<android.support.v7.widget.RecyclerView
android:id="@+id/rl_cart"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white_caocao"
app:layout_constraintBottom_toTopOf="@id/ll_info" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:background="@color/gray_huanggai"
app:layout_constraintBottom_toTopOf="@id/ll_info" />
<LinearLayout
android:id="@+id/ll_info"
android:layout_width="0dp"
android:layout_height="?attr/actionBarSize"
android:background="@color/white_caocao"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingEnd="@dimen/all_margin"
android:paddingStart="@dimen/all_margin"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/store_pay_amt"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/all_spacing"
android:text="@string/money_rmb"
android:textColor="@color/red_guanyu"
android:textSize="@dimen/all_text_size" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@{ConvertUtil.fenToYuan(orderPayAmt)}"
android:textColor="@color/red_guanyu"
android:textSize="@dimen/all_sub_title_size"
android:textStyle="bold" />
<TextView
android:id="@+id/tv_settle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/shape_red_round_rectangle_more_round"
android:foreground="?android:attr/actionBarItemBackground"
android:paddingBottom="@dimen/all_spacing"
android:paddingEnd="@dimen/all_margin_big"
android:paddingStart="@dimen/all_margin_big"
android:paddingTop="@dimen/all_spacing"
android:text="@string/store_btn_settle"
android:textColor="@color/white_caocao" />
</LinearLayout>
<FrameLayout
android:id="@+id/fl_logo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/all_margin"
android:layout_marginStart="@dimen/all_margin"
android:animateLayoutChanges="true"
app:layout_constraintBottom_toBottomOf="@id/ll_title"
app:layout_constraintLeft_toLeftOf="parent">
<ImageView
android:id="@+id/iv_cart"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_spacing"
android:contentDescription="@string/store_cart"
android:foreground="?attr/actionBarItemBackground"
android:src="@mipmap/shopping_cart" />
<TextView
android:layout_width="@dimen/store_cart_count"
android:layout_height="@dimen/store_cart_count"
android:layout_gravity="end"
android:background="@drawable/shape_white_oval"
android:gravity="center"
android:text='@{cartCount+""}'
android:textColor="@color/red_guanyu"
android:textSize="@{cartCount &lt; 100?@dimen/all_caption_size:@dimen/all_tiny_size}"
android:textStyle="bold"
android:visibility="@{cartCount>0?View.VISIBLE:View.GONE}" />
</FrameLayout>
</android.support.constraint.ConstraintLayout>
</layout> </layout>
\ No newline at end of file
app/src/main/res/layout/fragment_send_succ_ticker.xml 0 → 100644
View file @ e76a4fcd
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<data>
<variable
name="OnClickListener"
type="com.xingdata.zzdpos.util.OnClickListener"/>
</data>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray_zhouyu">
<include
android:id="@+id/ic_title"
layout="@layout/title"/>
<LinearLayout
android:id="@+id/ll_top"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@+id/ll_bottom"
android:layout_below="@+id/ic_title"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="300dp"
android:layout_margin="@dimen/all_padding"
android:background="@color/white"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
<ImageView
android:id="@+id/iv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:src="@mipmap/ic_succeed"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/iv"
android:layout_marginTop="@dimen/all_padding"
android:gravity="center"
android:text="发券成功"
android:textSize="@dimen/text_three_title"
android:textStyle="bold"/>
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:background="@color/light_gray"></View>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="@dimen/all_padding">
<TextView
android:layout_width="@dimen/all_textview_width"
android:layout_height="wrap_content"
android:text="优惠券："
android:textSize="@dimen/et_textsize"/>
<TextView
android:id="@+id/tv_ticker_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="right"
android:textSize="@dimen/et_textsize"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="@dimen/all_padding">
<TextView
android:layout_width="@dimen/all_textview_width"
android:layout_height="wrap_content"
android:text="发送对象："
android:textSize="@dimen/et_textsize"/>
<TextView
android:id="@+id/tv_send_ticker_user"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="right"
android:textSize="@dimen/et_textsize"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="@dimen/all_padding">
<TextView
android:layout_width="@dimen/all_textview_width"
android:layout_height="wrap_content"
android:text="发送时间："
android:textSize="@dimen/et_textsize"/>
<TextView
android:id="@+id/tv_send_ticker_time"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="right"
android:textSize="@dimen/et_textsize"/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
<Button
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/red_border"
android:onClick="@{OnClickListener}"
android:text="确 定"
android:textColor="@color/white"
android:textSize="@dimen/three_grid_unit"/>
</LinearLayout>
</RelativeLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/fragment_send_ticker.xml
View file @ e76a4fcd
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
<LinearLayout <LinearLayout
android:id="@+id/ll_top" android:id="@+id/ll_top"
android:layout_above="@+id/ll_bottom"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
...@@ -186,6 +187,7 @@ ...@@ -186,6 +187,7 @@
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/ll_bottom"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize" android:layout_height="?attr/actionBarSize"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
......
app/src/main/res/layout/fragment_store.xml
View file @ e76a4fcd
...@@ -2,11 +2,54 @@ ...@@ -2,11 +2,54 @@
<layout xmlns:android="http://schemas.android.com/apk/res/android" <layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"> xmlns:app="http://schemas.android.com/apk/res-auto">
<android.support.design.widget.CoordinatorLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/gray_zhouyu" android:background="@color/gray_zhouyu"
android:orientation="vertical"> android:orientation="vertical">
</android.support.design.widget.CoordinatorLayout> <LinearLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/white_caocao">
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_gravity="bottom"
android:background="@color/gray_huanggai" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_marginTop="@dimen/all_margin"
android:background="@color/gray_huanggai" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal">
<android.support.v7.widget.RecyclerView
android:id="@+id/rl_skugrp"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1" />
<android.support.v4.widget.SwipeRefreshLayout
android:id="@+id/srl_sku"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="3">
<android.support.v7.widget.RecyclerView
android:id="@+id/rl_sku"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</android.support.v4.widget.SwipeRefreshLayout>
</LinearLayout>
</LinearLayout>
</layout> </layout>
\ No newline at end of file
app/src/main/res/layout/fragment_store_search.xml
View file @ e76a4fcd
...@@ -13,50 +13,18 @@ ...@@ -13,50 +13,18 @@
android:background="@color/gray_zhouyu" android:background="@color/gray_zhouyu"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/white_caocao">
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_gravity="bottom"
android:background="@color/gray_huanggai" />
</LinearLayout>
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width" android:layout_height="@dimen/all_line_width"
android:layout_marginTop="@dimen/all_margin" android:layout_marginTop="@dimen/all_margin"
android:background="@color/gray_huanggai" /> android:background="@color/gray_huanggai" />
<LinearLayout <android.support.v7.widget.RecyclerView
android:id="@+id/rl_sku"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="horizontal"> android:background="@color/blue_mawu" />
<android.support.v7.widget.RecyclerView
android:id="@+id/rl_skugrp"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@color/green_kongrong">
</android.support.v7.widget.RecyclerView>
<android.support.v7.widget.RecyclerView
android:id="@+id/rl_sku"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="3"
android:background="@color/blue_mawu">
</android.support.v7.widget.RecyclerView>
</LinearLayout>
</LinearLayout> </LinearLayout>
</layout> </layout>
\ No newline at end of file
app/src/main/res/layout/item_marketing_menu.xml 0 → 100644
View file @ e76a4fcd
<?xml version="1.0" encoding="utf-8"?>
<layout>
<data>
</data>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_margin"
android:background="@color/white"
android:orientation="horizontal">
<ImageView
android:id="@+id/iv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="@dimen/all_margin"
android:src="@mipmap/right"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_toLeftOf="@+id/iv"
android:padding="@dimen/all_padding">
<ImageView
android:id="@+id/iv_logo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/vip_level"/>
<TextView
android:id="@+id/tv_menu_name"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center|left"
android:padding="@dimen/all_padding"
android:text="会员等级"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/et_textsize"/>
</LinearLayout>
</RelativeLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/item_store_saledetail.xml 0 → 100644
View file @ e76a4fcd
<?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">
<data>
<import type="android.view.View" />
<variable
name="count"
type="int" />
</data>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/white_caocao"
android:gravity="center"
android:paddingEnd="@dimen/all_margin"
android:paddingStart="@dimen/all_margin">
<TextView
android:id="@+id/tv_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:singleLine="true"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
<TextView
android:id="@+id/tv_price"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="end">
<ImageView
android:id="@+id/iv_reduce"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/store_reduce"
android:foreground="?android:attr/actionBarItemBackground"
android:src="@mipmap/but_reduce"
android:visibility="@{count>0?View.VISIBLE:View.INVISIBLE}" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_spacing"
android:layout_marginStart="@dimen/all_spacing"
android:text='@{count+""}'
android:textColor="@color/black_likui"
android:textSize="@dimen/all_text_size"
android:visibility="@{count>0?View.VISIBLE:View.INVISIBLE}" />
<ImageView
android:id="@+id/iv_increase"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/store_increase"
android:foreground="?android:attr/actionBarItemBackground"
android:src="@mipmap/but_increase02" />
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_marginEnd="@dimen/all_margin"
android:layout_marginStart="@dimen/all_margin"
android:background="@color/gray_kongming" />
</LinearLayout>
</layout>
app/src/main/res/layout/item_store_sku.xml
View file @ e76a4fcd
...@@ -2,11 +2,115 @@ ...@@ -2,11 +2,115 @@
<layout xmlns:android="http://schemas.android.com/apk/res/android" <layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"> xmlns:app="http://schemas.android.com/apk/res-auto">
<data>
<import type="android.view.View" />
<variable
name="count"
type="int" />
</data>
<android.support.constraint.ConstraintLayout <android.support.constraint.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/white_caocao" android:background="@color/white_caocao"
android:foreground="?android:attr/selectableItemBackground"> android:paddingEnd="@dimen/all_margin"
android:paddingStart="@dimen/all_margin"
android:paddingTop="@dimen/all_margin">
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/iv_pic"
android:layout_width="80dp"
android:layout_height="80dp"
app:failureImage="@mipmap/icon_goods_default"
app:placeholderImage="@mipmap/icon_goods_default"
app:roundedCornerRadius="@dimen/all_shape_radius" />
<TextView
android:id="@+id/tv_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/all_margin"
android:lines="2"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size"
app:layout_constraintLeft_toRightOf="@id/iv_pic"
app:layout_constraintRight_toRightOf="parent" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_spacing"
app:layout_constraintBottom_toBottomOf="@id/ll_count"
app:layout_constraintLeft_toLeftOf="@id/tv_name">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/money_rmb"
android:textColor="@color/red_guanyu"
android:textSize="@dimen/all_caption_size"
android:textStyle="bold" />
<TextView
android:id="@+id/tv_amt"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/red_guanyu"
android:textSize="@dimen/all_text_size"
android:textStyle="bold" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_spacing"
android:animateLayoutChanges="true"
android:gravity="center"
app:layout_constraintBottom_toBottomOf="@id/iv_pic"
app:layout_constraintRight_toRightOf="@id/tv_name">
<ImageView
android:id="@+id/iv_reduce"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/store_reduce"
android:foreground="?android:attr/actionBarItemBackground"
android:src="@mipmap/but_reduce"
android:visibility="gone" />
<TextView
android:id="@+id/tv_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_spacing"
android:layout_marginStart="@dimen/all_spacing"
android:text='@{count+""}'
android:textColor="@color/black_likui"
android:textSize="@dimen/all_sub_title_size"
android:visibility="gone" />
<ImageView
android:id="@+id/iv_increase"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/store_increase"
android:foreground="?android:attr/actionBarItemBackground"
android:src="@mipmap/but_increase02" />
</LinearLayout>
<View
android:layout_width="0dp"
android:layout_height="@dimen/all_line_width"
android:layout_marginTop="@dimen/all_margin"
android:background="@color/gray_kongming"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/iv_pic" />
</android.support.constraint.ConstraintLayout> </android.support.constraint.ConstraintLayout>
......
app/src/main/res/layout/item_store_skugrp.xml
View file @ e76a4fcd
...@@ -4,61 +4,37 @@ ...@@ -4,61 +4,37 @@
<data> <data>
<import type="android.view.View" />
<variable <variable
name="selected" name="selected"
type="boolean" /> type="boolean" />
</data> </data>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="vertical">
<FrameLayout
android:layout_width="120dp"
android:layout_height="?attr/actionBarSize"
android:background="@color/white_caocao"
android:foreground="?android:attr/selectableItemBackground">
<View
android:layout_width="@dimen/all_spacing"
android:layout_height="@dimen/all_sub_title_size"
android:layout_gravity="center_vertical"
android:background="@color/red_guanyu" />
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:text="全部商品"
android:textStyle="bold"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_sub_title_size" />
</FrameLayout>
<FrameLayout
android:layout_width="120dp"
android:layout_height="?attr/actionBarSize"
android:background="@color/gray_zhouyu"
android:foreground="?android:attr/selectableItemBackground">
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:textStyle="normal"
android:text="全部商品"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
</FrameLayout>
</LinearLayout> <FrameLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@{selected?@color/white_caocao:@color/transparent}"
android:foreground="?android:attr/selectableItemBackground">
<View
android:layout_width="@dimen/all_spacing"
android:layout_height="@dimen/all_sub_title_size"
android:layout_gravity="center_vertical"
android:background="@color/red_guanyu"
android:visibility="@{selected?View.VISIBLE:View.GONE}" />
<TextView
android:id="@+id/tv_name"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:textColor="@color/black_baozheng"
android:textSize="@{selected?@dimen/all_sub_title_size:@dimen/all_text_size}" />
</FrameLayout>
</layout> </layout>
......
app/src/main/res/layout/title.xml
View file @ e76a4fcd
...@@ -5,24 +5,24 @@ ...@@ -5,24 +5,24 @@
<variable <variable
name="onClickListener" name="onClickListener"
type="com.xingdata.zzdpos.util.OnClickListener" /> type="com.xingdata.zzdpos.util.OnClickListener"/>
</data> </data>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize" android:layout_height="?attr/actionBarSize"
android:background="@drawable/singleline_white_gray" android:background="@drawable/singleline_white_gray"
android:orientation="horizontal"> android:orientation="horizontal">
<ImageButton <ImageButton
android:id="@+id/iv_back" android:id="@+id/iv_back"
android:layout_width="60dp" android:layout_width="60dp"
android:layout_height="match_parent" android:layout_height="?attr/actionBarSize"
android:background="@mipmap/go_back" android:background="@mipmap/go_back"
android:onClick="@{onClickListener}" /> android:onClick="@{onClickListener}"/>
<TextView <TextView
android:id="@+id/tv_title" android:id="@+id/tv_title"
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:text="标题" android:text="标题"
android:textColor="@color/black_baozheng" android:textColor="@color/black_baozheng"
android:textSize="@dimen/text_secondary_title" /> android:textSize="@dimen/text_secondary_title"/>
</RelativeLayout> </RelativeLayout>
......
app/src/main/res/values/dimens.xml
View file @ e76a4fcd
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
<dimen name="all_margin_left">15dp</dimen> <dimen name="all_margin_left">15dp</dimen>
<dimen name="title_height">50dp</dimen> <dimen name="title_height">50dp</dimen>
<dimen name="small_text_size">13sp</dimen> <dimen name="small_text_size">13sp</dimen>
<dimen name="all_textview_width">120dp</dimen>
<dimen name="big_text_size">18sp</dimen> <dimen name="big_text_size">18sp</dimen>
<dimen name="sbig_text_size">25sp</dimen> <dimen name="sbig_text_size">25sp</dimen>
<integer name="all_top_weight">2</integer> <integer name="all_top_weight">2</integer>
......
app/src/main/res/values/strings.xml
View file @ e76a4fcd
...@@ -132,7 +132,6 @@ ...@@ -132,7 +132,6 @@
<string name="vip_info_discount">折扣：%s折</string> <string name="vip_info_discount">折扣：%s折</string>
<!--抹零页面--> <!--抹零页面-->
<string name="dis_change_title">抹零</string> <string name="dis_change_title">抹零</string>
<string name="dis_change_amt">应收:</string> <string name="dis_change_amt">应收:</string>
...@@ -539,6 +538,8 @@ ...@@ -539,6 +538,8 @@
<string name="store_ms_dis">已减</string> <string name="store_ms_dis">已减</string>
<string name="store_scan">扫描</string> <string name="store_scan">扫描</string>
<string name="store_search_hint">请输入商品名称/助记码/条码</string> <string name="store_search_hint">请输入商品名称/助记码/条码</string>
<string name="store_reduce">减少</string>
<string name="store_increase">添加</string>
<!--帮助POS--> <!--帮助POS-->
<string name="help_hint">帮助</string> <string name="help_hint">帮助</string>
......
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