Skip to content

S
supplier
Commit 76597c05 by 宁斌
Options

1、餐檯管理完善 

2、餐檯模式顯示 餐檯類型標誌，默認就餐人數
parent f01b18c5
Showing with 391 additions and 365 deletions
manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/model/bean/TableArea.java → base-module/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/TableArea.java
package com.gingersoft.gsa.cloud.manager.mvp.model.bean; package com.gingersoft.gsa.cloud.base.common.bean;
import com.gingersoft.gsa.cloud.ui.bean.view.SectionTextItem;
import com.qmuiteam.qmui.widget.section.QMUISection; import com.qmuiteam.qmui.widget.section.QMUISection;
import java.io.Serializable; import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
......
manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/model/bean/TableItem.java → base-module/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/TableItem.java
package com.gingersoft.gsa.cloud.manager.mvp.model.bean; package com.gingersoft.gsa.cloud.base.common.bean;
import com.gingersoft.gsa.cloud.base.common.bean.TableBean;
import com.qmuiteam.qmui.widget.section.QMUISection; import com.qmuiteam.qmui.widget.section.QMUISection;
import java.io.Serializable; import java.io.Serializable;
......
base-module/src/main/java/com/gingersoft/gsa/cloud/ui/recylcler/event/RecyItemTouchHelperCallback.java
...@@ -2,8 +2,11 @@ package com.gingersoft.gsa.cloud.ui.recylcler.event; ...@@ -2,8 +2,11 @@ package com.gingersoft.gsa.cloud.ui.recylcler.event;
import android.graphics.Color; import android.graphics.Color;
import com.gingersoft.gsa.cloud.base.common.bean.TableArea;
import com.gingersoft.gsa.cloud.base.common.bean.TableItem;
import com.gingersoft.gsa.cloud.base.utils.log.LogUtil; import com.gingersoft.gsa.cloud.base.utils.log.LogUtil;
import com.jess.arms.base.DefaultAdapter; import com.jess.arms.base.DefaultAdapter;
import com.jess.arms.base.delegate.IActivity;
import com.qmuiteam.qmui.widget.section.QMUIDefaultStickySectionAdapter; import com.qmuiteam.qmui.widget.section.QMUIDefaultStickySectionAdapter;
import com.qmuiteam.qmui.widget.section.QMUISection; import com.qmuiteam.qmui.widget.section.QMUISection;
import com.qmuiteam.qmui.widget.section.QMUIStickySectionAdapter; import com.qmuiteam.qmui.widget.section.QMUIStickySectionAdapter;
...@@ -62,31 +65,45 @@ public class RecyItemTouchHelperCallback<H extends QMUISection.Model<H>, T exten ...@@ -62,31 +65,45 @@ public class RecyItemTouchHelperCallback<H extends QMUISection.Model<H>, T exten
return false; return false;
} }
if (fromPosition < toPosition) { if (fromPosition < toPosition) {
for (int i = fromPosition; i < toPosition; i++) { if (mAdapter instanceof QMUIStickySectionAdapter) {
if (mAdapter instanceof QMUIStickySectionAdapter) { QMUIStickySectionAdapter sectionAdapter = (QMUIStickySectionAdapter) mAdapter;
QMUIStickySectionAdapter.ViewHolder holder = (QMUIStickySectionAdapter.ViewHolder) viewHolder; QMUIStickySectionAdapter.ViewHolder holder = (QMUIStickySectionAdapter.ViewHolder) viewHolder;
int pos = holder.isForStickyHeader ? i : holder.getAdapterPosition(); QMUISection<H, T> qmuiSections = sectionAdapter.getSection(holder.getAdapterPosition());
int itemIndex = ((QMUIStickySectionAdapter) mAdapter).getItemIndex(pos); List<?> list = qmuiSections.getItemList();
LogUtil.d(TAG, "fromPosition:" + fromPosition + " toPosition:" + toPosition + " itemIndex: " + itemIndex + " pos: " + pos);
QMUISection<H, T> qmuiSections = ((QMUIStickySectionAdapter) mAdapter).getSection(pos); int fromIndex = sectionAdapter.getItemIndex(fromPosition);
List<?> list = qmuiSections.getItemList(); int toIndex = sectionAdapter.getItemIndex(toPosition);
Collections.swap(list, itemIndex, itemIndex + 1);
} else { if ((fromIndex + 1) == list.size())
return false;
for (int i = fromIndex; i < toIndex; i++) {
Collections.swap(list, i, i + 1);
}
} else {
for (int i = fromPosition; i < toPosition; i++) {
Collections.swap(((DefaultAdapter) mAdapter).getInfos(), i, i + 1); Collections.swap(((DefaultAdapter) mAdapter).getInfos(), i, i + 1);
} }
} }
} else { } else {
for (int i = fromPosition; i > toPosition; i--) { if (mAdapter instanceof QMUIStickySectionAdapter) {
if (mAdapter instanceof QMUIStickySectionAdapter) { QMUIStickySectionAdapter sectionAdapter = (QMUIStickySectionAdapter) mAdapter;
QMUIStickySectionAdapter.ViewHolder holder = (QMUIStickySectionAdapter.ViewHolder) viewHolder; QMUIStickySectionAdapter.ViewHolder holder = (QMUIStickySectionAdapter.ViewHolder) viewHolder;
int pos = holder.isForStickyHeader ? i : holder.getAdapterPosition(); QMUISection<H, T> qmuiSections = sectionAdapter.getSection(holder.getAdapterPosition());
int itemIndex = ((QMUIStickySectionAdapter) mAdapter).getItemIndex(pos); List<?> list = qmuiSections.getItemList();
LogUtil.d(TAG, "fromPosition:" + fromPosition + " toPosition:" + toPosition + " itemIndex: " + itemIndex + " pos: " + pos);
QMUISection<H, T> qmuiSections = ((QMUIStickySectionAdapter) mAdapter).getSection(pos); int fromIndex = sectionAdapter.getItemIndex(fromPosition);
List<?> list = qmuiSections.getItemList(); int toIndex = sectionAdapter.getItemIndex(toPosition);
Collections.swap(list, itemIndex, itemIndex - 1);
} else { if ((fromIndex + 1) == list.size())
Collections.swap(((DefaultAdapter) mAdapter).getInfos(), fromPosition, toPosition - 1); return false;
for (int i = fromIndex; i > toIndex; i--) {
Collections.swap(list, i, i - 1);
}
} else {
for (int i = fromPosition; i > toPosition; i--) {
Collections.swap(((DefaultAdapter) mAdapter).getInfos(), i, i - 1);
} }
} }
} }
...@@ -116,10 +133,51 @@ public class RecyItemTouchHelperCallback<H extends QMUISection.Model<H>, T exten ...@@ -116,10 +133,51 @@ public class RecyItemTouchHelperCallback<H extends QMUISection.Model<H>, T exten
@Override @Override
public void clearView(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) { public void clearView(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
super.clearView(recyclerView, viewHolder); super.clearView(recyclerView, viewHolder);
// viewHolder.itemView.setBackgroundColor(Color.WHITE); viewHolder.itemView.setBackgroundColor(Color.WHITE);
String ids = "";
if (mAdapter instanceof QMUIStickySectionAdapter) {
QMUIStickySectionAdapter adapter = (QMUIStickySectionAdapter) mAdapter;
List<QMUISection<H, T>> qmuiSectionList = adapter.getCurrentData();
ids = getTableIds(qmuiSectionList);
} else {
DefaultAdapter adapter = (DefaultAdapter) mAdapter;
ids = getTableAreaIds(adapter.getInfos());
}
// mAdapter.notifyDataSetChanged();
if (onMoveListener != null) { if (onMoveListener != null) {
onMoveListener.onMoveFinish(); onMoveListener.onMoveFinish(ids);
}
}
private String getTableIds(List<QMUISection<H, T>> qmuiSectionList) {
StringBuilder builder = new StringBuilder();
for (QMUISection<H, T> qmuiSections : qmuiSectionList) {
for (T t : qmuiSections.getItemList()) {
TableItem tableItem = (TableItem) t;
if (tableItem.getLayoutType() == 0) {
builder.append(tableItem.getId());
builder.append(",");
}
}
}
String str = builder.toString();
if (str.endsWith(",")) {
str = str.substring(0, str.length() - 1);
}
return str;
}
private String getTableAreaIds(List<TableArea> tableAreaList) {
StringBuilder builder = new StringBuilder();
for (TableArea tableArea : tableAreaList) {
builder.append(tableArea.getId());
builder.append(",");
}
String str = builder.toString();
if (str.endsWith(",")) {
str = str.substring(0, str.length() - 1);
} }
return str;
} }
@Override @Override
...@@ -139,6 +197,6 @@ public class RecyItemTouchHelperCallback<H extends QMUISection.Model<H>, T exten ...@@ -139,6 +197,6 @@ public class RecyItemTouchHelperCallback<H extends QMUISection.Model<H>, T exten
} }
public interface onMoveListener { public interface onMoveListener {
void onMoveFinish(); void onMoveFinish(String ids);
} }
} }
\ No newline at end of file
base-module/src/main/java/com/gingersoft/gsa/cloud/ui/view/TriangleLabelView.java
...@@ -335,13 +335,13 @@ public class TriangleLabelView extends View { ...@@ -335,13 +335,13 @@ public class TriangleLabelView extends View {
canvas.drawPath(path, trianglePaint); canvas.drawPath(path, trianglePaint);
// draw secondaryText // draw secondaryText
if (corner.top()) { // if (corner.top()) {
canvas.drawText(secondary.text, (width) / 2, topPadding + secondary.height, secondary.paint); // canvas.drawText(secondary.text, (width) / 2, topPadding + secondary.height, secondary.paint);
canvas.drawText(primary.text, (width) / 2, (topPadding + secondary.height + centerPadding + primary.height), primary.paint); // canvas.drawText(primary.text, (width) / 2, (topPadding + secondary.height + centerPadding + primary.height), primary.paint);
} else { // } else {
canvas.drawText(secondary.text, (width) / 2, bottomPadding + secondary.height + centerPadding + primary.height, secondary.paint); // canvas.drawText(secondary.text, (width) / 2, bottomPadding + secondary.height + centerPadding + primary.height, secondary.paint);
canvas.drawText(primary.text, (width) / 2, (bottomPadding + primary.height), primary.paint); // canvas.drawText(primary.text, (width) / 2, (bottomPadding + primary.height), primary.paint);
} // }
canvas.restore(); canvas.restore();
} }
......
base-module/src/main/res/drawable/layer_list_triangle.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<!-- 倒三角 -->
<rotate
android:fromDegrees="-45"
android:pivotX="-45%"
android:pivotY="45%"
android:toDegrees="45"
>
<shape android:shape="rectangle">
<solid android:color="#f00" />
</shape>
</rotate>
</item>
</layer-list>
\ No newline at end of file
manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/contract/TableListContract.java
package com.gingersoft.gsa.cloud.manager.mvp.contract; package com.gingersoft.gsa.cloud.manager.mvp.contract;
import com.gingersoft.gsa.cloud.manager.mvp.model.bean.TableItem; import com.gingersoft.gsa.cloud.base.common.bean.TableItem;
import com.jess.arms.mvp.IView; import com.jess.arms.mvp.IView;
import com.jess.arms.mvp.IModel; import com.jess.arms.mvp.IModel;
......
manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/contract/TableManageContract.java
package com.gingersoft.gsa.cloud.manager.mvp.contract; package com.gingersoft.gsa.cloud.manager.mvp.contract;
import com.gingersoft.gsa.cloud.base.common.bean.BaseResult; import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.base.common.bean.FoodBean; import com.gingersoft.gsa.cloud.base.common.bean.TableItem;
import com.gingersoft.gsa.cloud.manager.mvp.model.bean.TableArea; import com.gingersoft.gsa.cloud.base.common.bean.TableArea;
import com.gingersoft.gsa.cloud.manager.mvp.model.bean.TableItem;
import com.jess.arms.mvp.IView; import com.jess.arms.mvp.IView;
import com.jess.arms.mvp.IModel; import com.jess.arms.mvp.IModel;
......
manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/model/TableManageModel.java
...@@ -161,7 +161,16 @@ public class TableManageModel extends BaseModel implements TableManageContract.M ...@@ -161,7 +161,16 @@ public class TableManageModel extends BaseModel implements TableManageContract.M
@Override @Override
public Observable<BaseResult> changeAreaSort(RequestBody requestBody) { public Observable<BaseResult> changeAreaSort(RequestBody requestBody) {
return mRepositoryManager.obtainRetrofitService(TableManageService.class) return mRepositoryManager.obtainRetrofitService(TableManageService.class)
.changeAreaSort(requestBody); .changeAreaSort(requestBody)
.flatMap(new Function<BaseResult, Observable<BaseResult>>() {
@Override
public Observable<BaseResult> apply(BaseResult info) throws Exception {
if (info != null && info.isSuccess()) {
return queryAreas();
}
return null;
}
});
} }
@Override @Override
......
manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/presenter/TableListPresenter.java
...@@ -2,8 +2,8 @@ package com.gingersoft.gsa.cloud.manager.mvp.presenter; ...@@ -2,8 +2,8 @@ package com.gingersoft.gsa.cloud.manager.mvp.presenter;
import android.app.Application; import android.app.Application;
import com.gingersoft.gsa.cloud.manager.mvp.model.bean.TableArea; import com.gingersoft.gsa.cloud.base.common.bean.TableItem;
import com.gingersoft.gsa.cloud.manager.mvp.model.bean.TableItem; import com.gingersoft.gsa.cloud.base.common.bean.TableArea;
import com.gingersoft.gsa.cloud.ui.bean.view.SectionHeader; import com.gingersoft.gsa.cloud.ui.bean.view.SectionHeader;
import com.jess.arms.integration.AppManager; import com.jess.arms.integration.AppManager;
import com.jess.arms.di.scope.FragmentScope; import com.jess.arms.di.scope.FragmentScope;
......
manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/presenter/TableManagePresenter.java
...@@ -5,19 +5,15 @@ import android.os.CountDownTimer; ...@@ -5,19 +5,15 @@ import android.os.CountDownTimer;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.common.bean.BaseResult; import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.base.common.bean.FoodBean; import com.gingersoft.gsa.cloud.base.common.bean.TableItem;
import com.gingersoft.gsa.cloud.base.common.bean.OrderDetail;
import com.gingersoft.gsa.cloud.base.utils.JsonUtils; import com.gingersoft.gsa.cloud.base.utils.JsonUtils;
import com.gingersoft.gsa.cloud.base.utils.gson.GsonUtils; import com.gingersoft.gsa.cloud.base.utils.gson.GsonUtils;
import com.gingersoft.gsa.cloud.base.utils.log.LogUtil; import com.gingersoft.gsa.cloud.base.utils.log.LogUtil;
import com.gingersoft.gsa.cloud.constans.GoldConstants; import com.gingersoft.gsa.cloud.constans.GoldConstants;
import com.gingersoft.gsa.cloud.database.utils.FoodDaoUtils; import com.gingersoft.gsa.cloud.base.common.bean.TableArea;
import com.gingersoft.gsa.cloud.manager.mvp.model.bean.TableArea;
import com.gingersoft.gsa.cloud.manager.mvp.model.bean.TableItem;
import com.gingersoft.gsa.cloud.manager.mvp.model.bean.request.AreaRequest; import com.gingersoft.gsa.cloud.manager.mvp.model.bean.request.AreaRequest;
import com.gingersoft.gsa.cloud.manager.mvp.model.bean.request.TableRequest; import com.gingersoft.gsa.cloud.manager.mvp.model.bean.request.TableRequest;
import com.gingersoft.gsa.cloud.manager.mvp.ui.activity.TableManageActivity; import com.gingersoft.gsa.cloud.manager.mvp.ui.activity.TableManageActivity;
import com.jess.arms.base.delegate.IActivity;
import com.jess.arms.integration.AppManager; import com.jess.arms.integration.AppManager;
import com.jess.arms.di.scope.ActivityScope; import com.jess.arms.di.scope.ActivityScope;
import com.jess.arms.mvp.BasePresenter; import com.jess.arms.mvp.BasePresenter;
...@@ -39,11 +35,8 @@ import com.gingersoft.gsa.cloud.manager.mvp.contract.TableManageContract; ...@@ -39,11 +35,8 @@ import com.gingersoft.gsa.cloud.manager.mvp.contract.TableManageContract;
import com.jess.arms.utils.RxLifecycleUtils; import com.jess.arms.utils.RxLifecycleUtils;
import com.scwang.smartrefresh.layout.api.RefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import static com.gingersoft.gsa.cloud.base.common.bean.OrderDetail.DISCOUNT_TYPE;
/** /**
* ================================================ * ================================================
...@@ -368,14 +361,12 @@ public class TableManagePresenter extends BasePresenter<TableManageContract.Mode ...@@ -368,14 +361,12 @@ public class TableManagePresenter extends BasePresenter<TableManageContract.Mode
}); });
} }
public void changeAreaSort(long id, long sort, long targetId, long targetSort) { public void changeAreaSort(String ids) {
RequestBody requestBody = new FormBody.Builder() RequestBody requestBody = new FormBody.Builder()
.add("id", String.valueOf(id)) .add("restaurantId", String.valueOf(GsaCloudApplication.getRestaurantId(mApplication)))
.add("sort", String.valueOf(sort)) .add("ids", ids)
.add("targetId", String.valueOf(targetId))
.add("targetSort", String.valueOf(targetSort))
.build(); .build();
LogUtil.d(TAG, "changeAreaSort " + " id:" + id + " sort:" + sort + " targetId:" + targetId + " targetSort:" + targetSort); LogUtil.d(TAG, "changeAreaSort " + " ids:" + ids );
mModel.changeAreaSort(requestBody) mModel.changeAreaSort(requestBody)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(null)) .doOnSubscribe(disposable -> mRootView.showLoading(null))
...@@ -389,9 +380,9 @@ public class TableManagePresenter extends BasePresenter<TableManageContract.Mode ...@@ -389,9 +380,9 @@ public class TableManagePresenter extends BasePresenter<TableManageContract.Mode
public void onNext(@NonNull BaseResult info) { public void onNext(@NonNull BaseResult info) {
if (info != null && info.isSuccess()) { if (info != null && info.isSuccess()) {
if (info.getData() != null) { if (info.getData() != null) {
List<TableItem> tableItems = JsonUtils.parseArray(info.getData(), TableItem.class); List<TableArea> tableAreas = JsonUtils.parseArray(info.getData(), TableArea.class);
if (tableItems.size() > 0) { if (tableAreas.size() > 0) {
mRootView.queryTablesSuccess(tableItems, TableManageActivity.CHANGE_AREA_SORT); mRootView.queryAreasSuccess(tableAreas, TableManageActivity.CHANGE_AREA_SORT);
} else { } else {
mRootView.showEmptyView(true, 0, null); mRootView.showEmptyView(true, 0, null);
} }
...@@ -405,11 +396,12 @@ public class TableManagePresenter extends BasePresenter<TableManageContract.Mode ...@@ -405,11 +396,12 @@ public class TableManagePresenter extends BasePresenter<TableManageContract.Mode
}); });
} }
public void changeTableSort() { public void changeTableSort(String ids) {
RequestBody requestBody = new FormBody.Builder() RequestBody requestBody = new FormBody.Builder()
.add("restaurantId", String.valueOf(GsaCloudApplication.getRestaurantId(mApplication))) .add("restaurantId", String.valueOf(GsaCloudApplication.getRestaurantId(mApplication)))
.add("ids", getTableIds()) .add("ids", ids)
.build(); .build();
LogUtil.d(TAG, "changeTableSort " + " ids:" + ids );
mModel.changeTableSort(requestBody) mModel.changeTableSort(requestBody)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
// .doOnSubscribe(disposable -> mRootView.showLoading(null)) // .doOnSubscribe(disposable -> mRootView.showLoading(null))
......
manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/ui/activity/TableManageActivity.java
...@@ -2,28 +2,15 @@ package com.gingersoft.gsa.cloud.manager.mvp.ui.activity; ...@@ -2,28 +2,15 @@ package com.gingersoft.gsa.cloud.manager.mvp.ui.activity;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.view.View;
import android.view.animation.AnimationUtils; import com.gingersoft.gsa.cloud.base.common.bean.TableItem;
import android.widget.Button; import com.gingersoft.gsa.cloud.base.common.bean.TableArea;
import android.widget.FrameLayout;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.base.utils.gson.GsonUtils;
import com.gingersoft.gsa.cloud.constans.MealConstant;
import com.gingersoft.gsa.cloud.manager.R2;
import com.gingersoft.gsa.cloud.manager.mvp.model.bean.TableArea;
import com.gingersoft.gsa.cloud.manager.mvp.model.bean.TableItem;
import com.gingersoft.gsa.cloud.manager.mvp.model.bean.request.AreaRequest; import com.gingersoft.gsa.cloud.manager.mvp.model.bean.request.AreaRequest;
import com.gingersoft.gsa.cloud.manager.mvp.model.bean.request.TableRequest; import com.gingersoft.gsa.cloud.manager.mvp.model.bean.request.TableRequest;
import com.gingersoft.gsa.cloud.manager.mvp.ui.fragment.AddAreaFragment;
import com.gingersoft.gsa.cloud.manager.mvp.ui.fragment.AddTableFragment; import com.gingersoft.gsa.cloud.manager.mvp.ui.fragment.AddTableFragment;
import com.gingersoft.gsa.cloud.manager.mvp.ui.fragment.AreaListFragment; import com.gingersoft.gsa.cloud.manager.mvp.ui.fragment.AreaListFragment;
import com.gingersoft.gsa.cloud.manager.mvp.ui.fragment.TableListFragment; import com.gingersoft.gsa.cloud.manager.mvp.ui.fragment.TableListFragment;
import com.gingersoft.gsa.cloud.ui.utils.AnimateUtils;
import com.gingersoft.gsa.cloud.ui.widget.dialog.LoadingDialog; import com.gingersoft.gsa.cloud.ui.widget.dialog.LoadingDialog;
import com.jess.arms.base.BaseActivity;
import com.jess.arms.base.BaseFragment;
import com.jess.arms.base.BaseFragmentActivity; import com.jess.arms.base.BaseFragmentActivity;
import com.jess.arms.di.component.AppComponent; import com.jess.arms.di.component.AppComponent;
import com.jess.arms.utils.ArmsUtils; import com.jess.arms.utils.ArmsUtils;
...@@ -32,35 +19,17 @@ import com.gingersoft.gsa.cloud.manager.mvp.contract.TableManageContract; ...@@ -32,35 +19,17 @@ import com.gingersoft.gsa.cloud.manager.mvp.contract.TableManageContract;
import com.gingersoft.gsa.cloud.manager.mvp.presenter.TableManagePresenter; import com.gingersoft.gsa.cloud.manager.mvp.presenter.TableManagePresenter;
import com.gingersoft.gsa.cloud.manager.R; import com.gingersoft.gsa.cloud.manager.R;
import com.jess.arms.utils.RxLifecycleUtils;
import com.qmuiteam.qmui.alpha.QMUIAlphaTextView;
import com.qmuiteam.qmui.widget.QMUITopBar;
import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet;
import com.qmuiteam.qmui.widget.section.QMUIStickySectionLayout;
import com.scwang.smartrefresh.layout.api.RefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Stack;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import butterknife.BindView;
import butterknife.OnClick;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
import me.jessyan.rxerrorhandler.handler.ErrorHandleSubscriber;
import me.yokeyword.fragmentation.ISupportFragment; import me.yokeyword.fragmentation.ISupportFragment;
import me.yokeyword.fragmentation.anim.DefaultHorizontalAnimator; import me.yokeyword.fragmentation.anim.DefaultHorizontalAnimator;
import me.yokeyword.fragmentation.anim.FragmentAnimator; import me.yokeyword.fragmentation.anim.FragmentAnimator;
import okhttp3.FormBody;
import okhttp3.MediaType;
import okhttp3.RequestBody;
import static com.jess.arms.utils.Preconditions.checkNotNull; import static com.jess.arms.utils.Preconditions.checkNotNull;
...@@ -178,12 +147,12 @@ public class TableManageActivity extends BaseFragmentActivity<TableManagePresent ...@@ -178,12 +147,12 @@ public class TableManageActivity extends BaseFragmentActivity<TableManagePresent
mPresenter.queryTables(refreshLayout, true); mPresenter.queryTables(refreshLayout, true);
} }
public void changeAreaSort(long id, long sort, long targetId, long targetSort) { public void changeAreaSort(String ids) {
mPresenter.changeAreaSort(id, sort, targetId, targetSort); mPresenter.changeAreaSort(ids);
} }
public void changeTableSort() { public void changeTableSort(String ids) {
mPresenter.changeTableSort(); mPresenter.changeTableSort(ids);
} }
public void updateTableServiceCharge(List<TableRequest.UpdateServiceCharge> request) { public void updateTableServiceCharge(List<TableRequest.UpdateServiceCharge> request) {
...@@ -354,7 +323,6 @@ public class TableManageActivity extends BaseFragmentActivity<TableManagePresent ...@@ -354,7 +323,6 @@ public class TableManageActivity extends BaseFragmentActivity<TableManagePresent
} }
} }
public List<TableArea> getTableAreaList() { public List<TableArea> getTableAreaList() {
return mTableAreaList; return mTableAreaList;
} }
......
manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/ui/adapter/AreaManageAdapter.java
package com.gingersoft.gsa.cloud.manager.mvp.ui.adapter; package com.gingersoft.gsa.cloud.manager.mvp.ui.adapter;
import android.content.Context; import android.content.Context;
import android.text.Editable; import android.view.MotionEvent;
import android.text.TextWatcher;
import android.view.View; import android.view.View;
import android.widget.CheckBox; import android.widget.CheckBox;
import android.widget.CompoundButton; import android.widget.CompoundButton;
import android.widget.EditText; import android.widget.EditText;
import android.widget.RadioButton;
import android.widget.TextView;
import com.gingersoft.gsa.cloud.manager.R; import com.gingersoft.gsa.cloud.manager.R;
import com.gingersoft.gsa.cloud.manager.R2; import com.gingersoft.gsa.cloud.manager.R2;
import com.gingersoft.gsa.cloud.manager.mvp.model.bean.TableArea; import com.gingersoft.gsa.cloud.base.common.bean.TableArea;
import com.jess.arms.base.BaseHolder; import com.jess.arms.base.BaseHolder;
import com.jess.arms.base.DefaultAdapter; import com.jess.arms.base.DefaultAdapter;
...@@ -96,8 +93,14 @@ public class AreaManageAdapter extends DefaultAdapter<TableArea> { ...@@ -96,8 +93,14 @@ public class AreaManageAdapter extends DefaultAdapter<TableArea> {
datasBean.setChecked(isChecked); datasBean.setChecked(isChecked);
} }
}); });
ed_name.setCursorVisible(true);
ed_name.setFocusable(true);
ed_name.setFocusableInTouchMode(true);
} else { } else {
cb_checked.setVisibility(View.GONE); cb_checked.setVisibility(View.GONE);
ed_name.setCursorVisible(false);
ed_name.setFocusable(false);
ed_name.setFocusableInTouchMode(false);
} }
} }
} }
......
manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/ui/adapter/TableManageSectiontAdapter.java
...@@ -2,40 +2,30 @@ package com.gingersoft.gsa.cloud.manager.mvp.ui.adapter; ...@@ -2,40 +2,30 @@ package com.gingersoft.gsa.cloud.manager.mvp.ui.adapter;
import android.content.Context; import android.content.Context;
import android.graphics.Color; import android.graphics.Color;
import android.text.TextUtils;
import android.view.Gravity; import android.view.Gravity;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.CheckBox; import android.widget.CheckBox;
import android.widget.CompoundButton; import android.widget.CompoundButton;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import android.widget.LinearLayout;
import android.widget.RadioButton;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
import com.gingersoft.gsa.cloud.aspectj.XClickUtil; import com.gingersoft.gsa.cloud.base.common.bean.TableItem;
import com.gingersoft.gsa.cloud.base.common.bean.TableBean;
import com.gingersoft.gsa.cloud.base.utils.time.TimeUtil;
import com.gingersoft.gsa.cloud.manager.R; import com.gingersoft.gsa.cloud.manager.R;
import com.gingersoft.gsa.cloud.manager.R2; import com.gingersoft.gsa.cloud.manager.R2;
import com.gingersoft.gsa.cloud.manager.mvp.model.bean.TableItem;
import com.gingersoft.gsa.cloud.ui.bean.view.SectionHeader; import com.gingersoft.gsa.cloud.ui.bean.view.SectionHeader;
import com.gingersoft.gsa.cloud.ui.view.TriangleLabelView; import com.gingersoft.gsa.cloud.ui.view.TriangleLabelView;
import com.gingersoft.gsa.cloud.ui.view.TriangleView;
import com.gingersoft.gsa.cloud.ui.view.qm.QDLoadingItemView; import com.gingersoft.gsa.cloud.ui.view.qm.QDLoadingItemView;
import com.gingersoft.gsa.cloud.ui.view.section.QDSectionHeaderView; import com.gingersoft.gsa.cloud.ui.view.section.QDSectionHeaderView;
import com.jess.arms.utils.DeviceUtils; import com.jess.arms.utils.DeviceUtils;
import com.qmuiteam.qmui.alpha.QMUIAlphaRelativeLayout;
import com.qmuiteam.qmui.layout.QMUIFrameLayout;
import com.qmuiteam.qmui.layout.QMUILinearLayout;
import com.qmuiteam.qmui.layout.QMUIRelativeLayout; import com.qmuiteam.qmui.layout.QMUIRelativeLayout;
import com.qmuiteam.qmui.util.QMUIDisplayHelper; import com.qmuiteam.qmui.util.QMUIDisplayHelper;
import com.qmuiteam.qmui.widget.section.QMUIDefaultStickySectionAdapter; import com.qmuiteam.qmui.widget.section.QMUIDefaultStickySectionAdapter;
import com.qmuiteam.qmui.widget.section.QMUISection; import com.qmuiteam.qmui.widget.section.QMUISection;
import com.qmuiteam.qmui.widget.section.QMUIStickySectionAdapter; import com.qmuiteam.qmui.widget.section.QMUIStickySectionAdapter;
import java.util.Date;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.core.content.ContextCompat; import androidx.core.content.ContextCompat;
import butterknife.BindView; import butterknife.BindView;
...@@ -121,7 +111,7 @@ public class TableManageSectiontAdapter extends QMUIDefaultStickySectionAdapter< ...@@ -121,7 +111,7 @@ public class TableManageSectiontAdapter extends QMUIDefaultStickySectionAdapter<
initAddItemDispalyMetrics(viewHolder); initAddItemDispalyMetrics(viewHolder);
viewHolder.ll_container.setBackgroundColor(Color.parseColor("#FFFFFFFF")); viewHolder.ll_container.setBackgroundColor(Color.parseColor("#FFFFFFFF"));
setBackGroundWork(viewHolder, Color.parseColor("#FFFFFFFF"), R.color.black); setBackGroundWork(viewHolder, Color.parseColor("#FFFFFFFF"), R.color.black,R.color.theme_black);
} else { } else {
...@@ -175,21 +165,21 @@ public class TableManageSectiontAdapter extends QMUIDefaultStickySectionAdapter< ...@@ -175,21 +165,21 @@ public class TableManageSectiontAdapter extends QMUIDefaultStickySectionAdapter<
if (item.getStatus() != 0) { if (item.getStatus() != 0) {
switch (item.getType()) { switch (item.getType()) {
case TableItem.TABLE_TYPE_CANTEEN: case TableItem.TABLE_TYPE_CANTEEN:
viewHolder.tlv_table_type.setPrimaryText("堂"); viewHolder.tv_type_labe.setText("堂");
viewHolder.tlv_table_type.setPrimaryTextColor(Color.parseColor("#249B65")); viewHolder.tv_type_labe.setTextColor(Color.parseColor("#249B65"));
break; break;
case TableItem.TABLE_TYPE_TAKEAWAY: case TableItem.TABLE_TYPE_TAKEAWAY:
viewHolder.tlv_table_type.setPrimaryText("外"); viewHolder.tv_type_labe.setText("外");
viewHolder.tlv_table_type.setPrimaryTextColor(Color.parseColor("#FF720A")); viewHolder.tv_type_labe.setTextColor(Color.parseColor("#FF720A"));
break; break;
case TableItem.TABLE_TYPE_SELF_FETCHING: case TableItem.TABLE_TYPE_SELF_FETCHING:
viewHolder.tlv_table_type.setPrimaryText("自"); viewHolder.tv_type_labe.setText("自");
viewHolder.tlv_table_type.setPrimaryTextColor(Color.parseColor("#00479D")); viewHolder.tv_type_labe.setTextColor(Color.parseColor("#00479D"));
break; break;
} }
viewHolder.tlv_table_type.setVisibility(View.VISIBLE); viewHolder.fl_table_type.setVisibility(View.VISIBLE);
} else { } else {
viewHolder.tlv_table_type.setVisibility(View.GONE); viewHolder.fl_table_type.setVisibility(View.GONE);
} }
} }
...@@ -201,28 +191,24 @@ public class TableManageSectiontAdapter extends QMUIDefaultStickySectionAdapter< ...@@ -201,28 +191,24 @@ public class TableManageSectiontAdapter extends QMUIDefaultStickySectionAdapter<
viewHolder.ll_container.setBackgroundColor(Color.parseColor("#FFFFFFFF")); viewHolder.ll_container.setBackgroundColor(Color.parseColor("#FFFFFFFF"));
if (item.getUseStatus() == 1) { if (item.getUseStatus() == 1) {
setBackGroundWork(viewHolder, Color.parseColor("#FFD14141"), R.color.theme_white_color); setBackGroundWork(viewHolder, Color.parseColor("#FFD14141"), R.color.theme_white_color,R.color.theme_black);
} else { } else {
switch (item.getStatus()) { switch (item.getStatus()) {
case 0: case 0:
setBackGroundWork(viewHolder, Color.parseColor("#FFFFFFFF"), R.color.black); setBackGroundWork(viewHolder, Color.parseColor("#FFFFFFFF"), R.color.black,R.color.theme_black);
break; break;
case 1: case 1:
// setBackGroundWork(item, "2", R.drawable.table_shape_table_send, R.drawable.tablebutton_glassgreen_new, R.color.theme_white_color); break; // setBackGroundWork(item, "2", R.drawable.table_shape_table_send, R.drawable.tablebutton_glassgreen_new, R.color.theme_white_color); break;
case 2: case 2:
setBackGroundWork(viewHolder, Color.parseColor("#FF249B65"), R.color.theme_white_color); setBackGroundWork(viewHolder, Color.parseColor("#FF249B65"), R.color.theme_white_color,R.color.theme_white_color);
break; break;
case 3: case 3:
setBackGroundWork(viewHolder, Color.parseColor("#FFE5AC00"), R.color.theme_white_color); setBackGroundWork(viewHolder, Color.parseColor("#FFE5AC00"), R.color.theme_white_color,R.color.theme_white_color);
break; break;
case 4: case 4:
setBackGroundWork(viewHolder, ContextCompat.getColor(context, R.color.Violet), R.color.theme_white_color);
break;
case 5: case 5:
setBackGroundWork(viewHolder, ContextCompat.getColor(context, R.color.Violet), R.color.theme_white_color);
break;
case 6: case 6:
setBackGroundWork(viewHolder, ContextCompat.getColor(context, R.color.Violet), R.color.theme_white_color); setBackGroundWork(viewHolder, ContextCompat.getColor(context, R.color.Violet), R.color.theme_white_color,R.color.theme_white_color);
break; break;
} }
} }
...@@ -242,11 +228,12 @@ public class TableManageSectiontAdapter extends QMUIDefaultStickySectionAdapter< ...@@ -242,11 +228,12 @@ public class TableManageSectiontAdapter extends QMUIDefaultStickySectionAdapter<
viewHolder.rl_table.setLayoutParams(relativeLayout); viewHolder.rl_table.setLayoutParams(relativeLayout);
} }
private void setBackGroundWork(ViewHolder viewHolder, int defaultMainback, int defaultFontColor) { private void setBackGroundWork(ViewHolder viewHolder, int defaultMainback, int defaultFontColor,int serviceFeeFontColor) {
if (defaultMainback != -1) { if (defaultMainback != -1) {
viewHolder.ll_container.setBackgroundColor(defaultMainback); viewHolder.ll_container.setBackgroundColor(defaultMainback);
} }
viewHolder.tv_table.setTextColor(context.getResources().getColor(defaultFontColor)); viewHolder.tv_table.setTextColor(context.getResources().getColor(defaultFontColor));
viewHolder.tv_service_fee.setTextColor(context.getResources().getColor(serviceFeeFontColor));
} }
private void initAddItemDispalyMetrics(ViewHolder viewHolder) { private void initAddItemDispalyMetrics(ViewHolder viewHolder) {
...@@ -287,8 +274,12 @@ public class TableManageSectiontAdapter extends QMUIDefaultStickySectionAdapter< ...@@ -287,8 +274,12 @@ public class TableManageSectiontAdapter extends QMUIDefaultStickySectionAdapter<
@BindView(R2.id.fl_add_table) @BindView(R2.id.fl_add_table)
FrameLayout fl_add_table; FrameLayout fl_add_table;
@BindView(R2.id.fl_table_type)
FrameLayout fl_table_type;
@BindView(R2.id.tlv_table_type) @BindView(R2.id.tlv_table_type)
TriangleLabelView tlv_table_type; TriangleLabelView tlv_table_type;
@BindView(R2.id.tv_type_labe)
TextView tv_type_labe;
public ViewHolder(View itemView) { public ViewHolder(View itemView) {
......
manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/ui/fragment/AddAreaFragment.java
...@@ -13,7 +13,7 @@ import android.widget.TextView; ...@@ -13,7 +13,7 @@ import android.widget.TextView;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
import com.gingersoft.gsa.cloud.manager.R2; import com.gingersoft.gsa.cloud.manager.R2;
import com.gingersoft.gsa.cloud.manager.mvp.model.bean.TableArea; import com.gingersoft.gsa.cloud.base.common.bean.TableArea;
import com.gingersoft.gsa.cloud.manager.mvp.model.bean.request.AreaRequest; import com.gingersoft.gsa.cloud.manager.mvp.model.bean.request.AreaRequest;
import com.gingersoft.gsa.cloud.manager.mvp.ui.activity.TableManageActivity; import com.gingersoft.gsa.cloud.manager.mvp.ui.activity.TableManageActivity;
import com.gingersoft.gsa.cloud.ui.widget.dialog.LoadingDialog; import com.gingersoft.gsa.cloud.ui.widget.dialog.LoadingDialog;
......
manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/ui/fragment/AddTableFragment.java
...@@ -7,20 +7,14 @@ import android.view.Gravity; ...@@ -7,20 +7,14 @@ import android.view.Gravity;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.ViewGroup.MarginLayoutParams;
import android.view.inputmethod.EditorInfo; import android.view.inputmethod.EditorInfo;
import android.widget.Button; import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import android.widget.LinearLayout;
import android.widget.PopupWindow;
import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.common.bean.TableItem;
import com.gingersoft.gsa.cloud.manager.R2; import com.gingersoft.gsa.cloud.manager.R2;
import com.gingersoft.gsa.cloud.manager.mvp.model.bean.TableArea;
import com.gingersoft.gsa.cloud.manager.mvp.model.bean.TableItem;
import com.gingersoft.gsa.cloud.manager.mvp.model.bean.request.TableRequest; import com.gingersoft.gsa.cloud.manager.mvp.model.bean.request.TableRequest;
import com.gingersoft.gsa.cloud.manager.mvp.ui.activity.TableManageActivity; import com.gingersoft.gsa.cloud.manager.mvp.ui.activity.TableManageActivity;
import com.gingersoft.gsa.cloud.ui.widget.dialog.LoadingDialog; import com.gingersoft.gsa.cloud.ui.widget.dialog.LoadingDialog;
...@@ -37,17 +31,10 @@ import com.qmuiteam.qmui.widget.QMUITopBarLayout; ...@@ -37,17 +31,10 @@ import com.qmuiteam.qmui.widget.QMUITopBarLayout;
import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet;
import com.qmuiteam.qmui.widget.grouplist.QMUICommonListItemView; import com.qmuiteam.qmui.widget.grouplist.QMUICommonListItemView;
import com.qmuiteam.qmui.widget.grouplist.QMUIGroupListView; import com.qmuiteam.qmui.widget.grouplist.QMUIGroupListView;
import com.qmuiteam.qmui.widget.popup.QMUIPopup;
import com.qmuiteam.qmui.widget.popup.QMUIPopups;
import java.util.List;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.core.content.ContextCompat; import androidx.core.content.ContextCompat;
import butterknife.BindView; import butterknife.BindView;
import static com.jess.arms.utils.Preconditions.checkNotNull; import static com.jess.arms.utils.Preconditions.checkNotNull;
...@@ -433,6 +420,13 @@ public class AddTableFragment extends BaseFragment<AddTablePresenter> implements ...@@ -433,6 +420,13 @@ public class AddTableFragment extends BaseFragment<AddTablePresenter> implements
if (!TextUtils.isEmpty(defalutPeopleNumberEditText.getText().toString())) { if (!TextUtils.isEmpty(defalutPeopleNumberEditText.getText().toString())) {
update.setSeatCount(Integer.parseInt(defalutPeopleNumberEditText.getText().toString())); update.setSeatCount(Integer.parseInt(defalutPeopleNumberEditText.getText().toString()));
} }
if (!TextUtils.isEmpty(peopleMaxNumberEditText.getText().toString())) {
update.setMaxSeatCount(Integer.parseInt(peopleMaxNumberEditText.getText().toString()));
}
if (!TextUtils.isEmpty(peopleMixNumberEditText.getText().toString())) {
update.setMinSeatCount(Integer.parseInt(peopleMixNumberEditText.getText().toString()));
}
update.setType(tableType);
return update; return update;
} }
......
manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/ui/fragment/AreaListFragment.java
package com.gingersoft.gsa.cloud.manager.mvp.ui.fragment; package com.gingersoft.gsa.cloud.manager.mvp.ui.fragment;
import android.content.Intent; import android.content.Intent;
import android.graphics.Color;
import android.net.ParseException; import android.net.ParseException;
import android.os.Bundle; import android.os.Bundle;
import android.os.Message;
import android.text.Editable;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.BaseAdapter;
import android.widget.Button; import android.widget.Button;
import android.widget.CheckBox; import android.widget.CheckBox;
import android.widget.CompoundButton; import android.widget.CompoundButton;
import android.widget.EditText; import android.widget.EditText;
import android.widget.ImageView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.utils.other.SPUtils;
import com.gingersoft.gsa.cloud.constans.PrintConstans;
import com.gingersoft.gsa.cloud.manager.R2; import com.gingersoft.gsa.cloud.manager.R2;
import com.gingersoft.gsa.cloud.manager.mvp.model.bean.TableArea; import com.gingersoft.gsa.cloud.base.common.bean.TableArea;
import com.gingersoft.gsa.cloud.manager.mvp.model.bean.TableItem;
import com.gingersoft.gsa.cloud.manager.mvp.model.bean.request.AreaRequest; import com.gingersoft.gsa.cloud.manager.mvp.model.bean.request.AreaRequest;
import com.gingersoft.gsa.cloud.manager.mvp.ui.activity.TableManageActivity; import com.gingersoft.gsa.cloud.manager.mvp.ui.activity.TableManageActivity;
import com.gingersoft.gsa.cloud.manager.mvp.ui.adapter.AreaManageAdapter; import com.gingersoft.gsa.cloud.manager.mvp.ui.adapter.AreaManageAdapter;
...@@ -47,40 +37,28 @@ import com.gingersoft.gsa.cloud.manager.mvp.presenter.AreaListPresenter; ...@@ -47,40 +37,28 @@ import com.gingersoft.gsa.cloud.manager.mvp.presenter.AreaListPresenter;
import com.gingersoft.gsa.cloud.manager.R; import com.gingersoft.gsa.cloud.manager.R;
import com.qmuiteam.qmui.alpha.QMUIAlphaFrameLayout; import com.qmuiteam.qmui.alpha.QMUIAlphaFrameLayout;
import com.qmuiteam.qmui.alpha.QMUIAlphaTextView;
import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.qmuiteam.qmui.widget.QMUIEmptyView;
import com.qmuiteam.qmui.widget.QMUITopBarLayout; import com.qmuiteam.qmui.widget.QMUITopBarLayout;
import com.qmuiteam.qmui.widget.section.QMUIStickySectionAdapter;
import com.scwang.smartrefresh.layout.api.RefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout;
import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener;
import com.scwang.smartrefresh.layout.listener.OnRefreshListener; import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
import com.yanzhenjie.recyclerview.OnItemClickListener;
import com.yanzhenjie.recyclerview.SwipeMenuCreator;
import com.yanzhenjie.recyclerview.SwipeMenuItem;
import com.yanzhenjie.recyclerview.SwipeRecyclerView;
import com.yanzhenjie.recyclerview.touch.OnItemMoveListener;
import com.yanzhenjie.recyclerview.touch.OnItemStateChangedListener;
import com.yanzhenjie.recyclerview.widget.DefaultItemDecoration;
import org.json.JSONException; import org.json.JSONException;
import java.net.SocketTimeoutException; import java.net.SocketTimeoutException;
import java.net.UnknownHostException; import java.net.UnknownHostException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.List; import java.util.List;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat; import androidx.core.content.ContextCompat;
import androidx.core.view.ViewCompat;
import androidx.recyclerview.widget.ItemTouchHelper; import androidx.recyclerview.widget.ItemTouchHelper;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView; import butterknife.BindView;
import butterknife.OnClick; import butterknife.OnClick;
import static com.gingersoft.gsa.cloud.manager.mvp.ui.activity.TableManageActivity.ADD_AREA_RESULT_SUCCESS;
import static com.jess.arms.utils.Preconditions.checkNotNull; import static com.jess.arms.utils.Preconditions.checkNotNull;
...@@ -219,11 +197,18 @@ public class AreaListFragment extends BaseFragment<AreaListPresenter> implements ...@@ -219,11 +197,18 @@ public class AreaListFragment extends BaseFragment<AreaListPresenter> implements
@Override @Override
public void onLongClick(RecyclerView.ViewHolder viewHolder) { public void onLongClick(RecyclerView.ViewHolder viewHolder) {
AreaManageAdapter.TopTableAreaItemHolder viewHolder1 = (AreaManageAdapter.TopTableAreaItemHolder) viewHolder; // AreaManageAdapter.TopTableAreaItemHolder viewHolder1 = (AreaManageAdapter.TopTableAreaItemHolder) viewHolder;
Toast.makeText(mActivity, "長按：" + viewHolder1.getAdapterPosition(), Toast.LENGTH_SHORT).show(); // Toast.makeText(mActivity, "長按：" + viewHolder1.getAdapterPosition(), Toast.LENGTH_SHORT).show();
if (viewHolder.getLayoutPosition() != 0) { // if (viewHolder.getLayoutPosition() != 0) {
itemTouchHelper.startDrag(viewHolder); // itemTouchHelper.startDrag(viewHolder);
} // }
}
});
itemTouchHelperCallback.setOnMoveListener(new RecyItemTouchHelperCallback.onMoveListener() {
@Override
public void onMoveFinish(String ids) {
mActivity.changeAreaSort(ids);
} }
}); });
} }
......
manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/ui/fragment/TableListFragment.java
...@@ -17,10 +17,10 @@ import android.widget.CompoundButton; ...@@ -17,10 +17,10 @@ import android.widget.CompoundButton;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import com.gingersoft.gsa.cloud.base.common.bean.TableItem;
import com.gingersoft.gsa.cloud.manager.R2; import com.gingersoft.gsa.cloud.manager.R2;
import com.gingersoft.gsa.cloud.manager.di.component.DaggerTableListComponent; import com.gingersoft.gsa.cloud.manager.di.component.DaggerTableListComponent;
import com.gingersoft.gsa.cloud.manager.mvp.model.bean.TableArea; import com.gingersoft.gsa.cloud.base.common.bean.TableArea;
import com.gingersoft.gsa.cloud.manager.mvp.model.bean.TableItem;
import com.gingersoft.gsa.cloud.manager.mvp.model.bean.request.TableRequest; import com.gingersoft.gsa.cloud.manager.mvp.model.bean.request.TableRequest;
import com.gingersoft.gsa.cloud.manager.mvp.ui.activity.TableManageActivity; import com.gingersoft.gsa.cloud.manager.mvp.ui.activity.TableManageActivity;
import com.gingersoft.gsa.cloud.manager.mvp.ui.adapter.TableManageSectiontAdapter; import com.gingersoft.gsa.cloud.manager.mvp.ui.adapter.TableManageSectiontAdapter;
...@@ -106,7 +106,7 @@ public class TableListFragment extends BaseFragment<TableListPresenter> implemen ...@@ -106,7 +106,7 @@ public class TableListFragment extends BaseFragment<TableListPresenter> implemen
@BindView(R2.id.cb_all_select) @BindView(R2.id.cb_all_select)
CheckBox cb_all_select; CheckBox cb_all_select;
private Button rightButton; private Button rightButton;
private TableManageActivity mActivity; private TableManageActivity mActivity;
...@@ -161,10 +161,10 @@ public class TableListFragment extends BaseFragment<TableListPresenter> implemen ...@@ -161,10 +161,10 @@ public class TableListFragment extends BaseFragment<TableListPresenter> implemen
initTopbar(); initTopbar();
initRefreshLayout(); initRefreshLayout();
initStickyLayout(); initStickyLayout();
// initRecycleScrollListener(); initRecycleScrollListener();
mActivity.queryAreas(null); mActivity.queryAreas(null);
mActivity.queryTables(null); mActivity.queryTables(null);
// mActivity.initGetTableTimer(); mActivity.initGetTableTimer();
cb_all_select.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { cb_all_select.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override @Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
...@@ -184,14 +184,14 @@ public class TableListFragment extends BaseFragment<TableListPresenter> implemen ...@@ -184,14 +184,14 @@ public class TableListFragment extends BaseFragment<TableListPresenter> implemen
super.onResume(); super.onResume();
hideSoftInput(); hideSoftInput();
//開始刷新餐檯數據 //開始刷新餐檯數據
// mActivity.onStartRefreshTableData(); mActivity.onStartRefreshTableData();
} }
@Override @Override
public void onPause() { public void onPause() {
super.onPause(); super.onPause();
//停止刷新餐檯數據 //停止刷新餐檯數據
// mActivity.onPauseRefreshTableData(); mActivity.onPauseRefreshTableData();
} }
@Override @Override
...@@ -204,7 +204,7 @@ public class TableListFragment extends BaseFragment<TableListPresenter> implemen ...@@ -204,7 +204,7 @@ public class TableListFragment extends BaseFragment<TableListPresenter> implemen
mTopBar.addLeftBackImageButton().setOnClickListener(v -> killMyself()); mTopBar.addLeftBackImageButton().setOnClickListener(v -> killMyself());
mTopBar.setTitle("餐檯管理").setTextColor(ContextCompat.getColor(mContext, R.color.theme_white_color)); mTopBar.setTitle("餐檯管理").setTextColor(ContextCompat.getColor(mContext, R.color.theme_white_color));
rightButton = mTopBar.addRightTextButton("編輯", R.id.qmui_dialog_edit_right_icon); rightButton = mTopBar.addRightTextButton("編輯", R.id.qmui_dialog_edit_right_icon);
rightButton.setTextColor(ContextCompat.getColor(mContext, R.color.theme_white_color)); rightButton.setTextColor(ContextCompat.getColor(mContext, R.color.theme_white_color));
rightButton.setOnClickListener(v -> { rightButton.setOnClickListener(v -> {
clickEdit(rightButton); clickEdit(rightButton);
...@@ -218,10 +218,12 @@ public class TableListFragment extends BaseFragment<TableListPresenter> implemen ...@@ -218,10 +218,12 @@ public class TableListFragment extends BaseFragment<TableListPresenter> implemen
if (rightButton != null) { if (rightButton != null) {
rightButton.setText("取消"); rightButton.setText("取消");
} }
mActivity.onPauseRefreshTableData();
} else { } else {
if (rightButton != null) { if (rightButton != null) {
rightButton.setText("編輯"); rightButton.setText("編輯");
} }
mActivity.onStartRefreshTableData();
} }
showRadioEdit(); showRadioEdit();
mAdapter.setRadioEdit(isRadioEdit); mAdapter.setRadioEdit(isRadioEdit);
...@@ -306,17 +308,16 @@ public class TableListFragment extends BaseFragment<TableListPresenter> implemen ...@@ -306,17 +308,16 @@ public class TableListFragment extends BaseFragment<TableListPresenter> implemen
public void onLongClick(RecyclerView.ViewHolder viewHolder) { public void onLongClick(RecyclerView.ViewHolder viewHolder) {
// QMUIStickySectionAdapter.ViewHolder viewHolder1 = (QMUIStickySectionAdapter.ViewHolder) viewHolder; // QMUIStickySectionAdapter.ViewHolder viewHolder1 = (QMUIStickySectionAdapter.ViewHolder) viewHolder;
// Toast.makeText(mActivity, "長按：" + viewHolder1.getAdapterPosition(), Toast.LENGTH_SHORT).show(); // Toast.makeText(mActivity, "長按：" + viewHolder1.getAdapterPosition(), Toast.LENGTH_SHORT).show();
if (viewHolder.getLayoutPosition() != 0) { // if (viewHolder.getLayoutPosition() != 0) {
itemTouchHelper.startDrag(viewHolder); // itemTouchHelper.startDrag(viewHolder);
} // }
} }
}); });
itemTouchHelperCallback.setOnMoveListener(new RecyItemTouchHelperCallback.onMoveListener() { itemTouchHelperCallback.setOnMoveListener(new RecyItemTouchHelperCallback.onMoveListener() {
@Override @Override
public void onMoveFinish() { public void onMoveFinish(String ids) {
mAdapter.notifyDataSetChanged(); mActivity.changeTableSort(ids);
mActivity.changeTableSort();
} }
}); });
...@@ -355,9 +356,11 @@ public class TableListFragment extends BaseFragment<TableListPresenter> implemen ...@@ -355,9 +356,11 @@ public class TableListFragment extends BaseFragment<TableListPresenter> implemen
mTableAreaSectionList.addAll(mPresenter.tableAreaTransformToSection(mPresenter.assembleTableArea(mPresenter.assembleAreaList(tableAreaList, mTableList), mTableList))); mTableAreaSectionList.addAll(mPresenter.tableAreaTransformToSection(mPresenter.assembleTableArea(mPresenter.assembleAreaList(tableAreaList, mTableList), mTableList)));
// if (!initLoad) { // if (!initLoad) {
mAdapter.setData(mTableAreaSectionList); mAdapter.setData(mTableAreaSectionList);
// } else { // } else {
// mAdapter.getCurrentData().clear();
// mAdapter.getCurrentData().addAll(mTableAreaSectionList);
// mAdapter.notifyDataSetChanged(); // mAdapter.notifyDataSetChanged();
// } // }
......
manager-module/src/main/res/layout/fragment_table_list.xml
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
app:srlEnableLoadMore="false" app:srlEnableLoadMore="false"
app:srlEnableRefresh="false"
android:layout_marginBottom="@dimen/dp_10"> android:layout_marginBottom="@dimen/dp_10">
<com.qmuiteam.qmui.widget.section.QMUIStickySectionLayout <com.qmuiteam.qmui.widget.section.QMUIStickySectionLayout
......
manager-module/src/main/res/layout/manager_item_manage_table.xml
...@@ -43,8 +43,8 @@ ...@@ -43,8 +43,8 @@
android:layout_marginTop="@dimen/dp_2" android:layout_marginTop="@dimen/dp_2"
android:layout_below="@+id/tv_people" android:layout_below="@+id/tv_people"
android:text="" android:text=""
android:textColor="@color/theme_text_pice_color" android:textColor="@color/theme_black"
android:textSize="@dimen/sp_16" /> android:textSize="@dimen/sp_13" />
<!-- <com.qmuiteam.qmui.alpha.QMUIAlphaButton--> <!-- <com.qmuiteam.qmui.alpha.QMUIAlphaButton-->
<!-- android:id="@+id/btn_showMain"--> <!-- android:id="@+id/btn_showMain"-->
...@@ -92,18 +92,34 @@ ...@@ -92,18 +92,34 @@
android:visibility="invisible" /> android:visibility="invisible" />
</com.qmuiteam.qmui.alpha.QMUIAlphaRelativeLayout> </com.qmuiteam.qmui.alpha.QMUIAlphaRelativeLayout>
<com.gingersoft.gsa.cloud.ui.view.TriangleLabelView <FrameLayout
android:id="@+id/tlv_table_type" android:id="@+id/fl_table_type"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:visibility="gone">
<com.gingersoft.gsa.cloud.ui.view.TriangleLabelView
android:id="@+id/tlv_table_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:backgroundColor="@color/theme_white_color" app:backgroundColor="@color/theme_white_color"
app:corner="rightBottom" app:corner="rightBottom"
app:primaryText="堂" app:primaryText="堂"
app:primaryTextColor="#249B65" app:primaryTextColor="#249B65"
app:primaryTextSize="10sp" app:primaryTextSize="10sp" />
android:visibility="gone"/>
<TextView
android:id="@+id/tv_type_labe"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right|bottom"
android:text="堂"
android:textColor="#249B65"
android:textSize="10sp"
android:padding="@dimen/dp_5"/>
</FrameLayout>
<FrameLayout <FrameLayout
android:id="@+id/fl_add_table" android:id="@+id/fl_add_table"
......
qm-qmui/src/main/java/com/qmuiteam/qmui/widget/section/QMUIStickySectionAdapter.java
...@@ -113,7 +113,7 @@ public abstract class QMUIStickySectionAdapter<H extends QMUISection.Model<H>, T ...@@ -113,7 +113,7 @@ public abstract class QMUIStickySectionAdapter<H extends QMUISection.Model<H>, T
* @param newData new section list * @param newData new section list
*/ */
protected void beforeDiffInSet(List<QMUISection<H, T>> oldData, List<QMUISection<H, T>> newData) { protected void beforeDiffInSet(List<QMUISection<H, T>> oldData, List<QMUISection<H, T>> newData) {
notifyDataSetChanged();
} }
/** /**
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/TablePresenter.java
...@@ -382,6 +382,8 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont ...@@ -382,6 +382,8 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
openTableBean = new TableBean.DataBean(dataBean); openTableBean = new TableBean.DataBean(dataBean);
} }
OpenTableManage.getDefault().setPeopleNumber(dataBean.getSeatCount());
OrderBean orderBean = respose.getData(); OrderBean orderBean = respose.getData();
if (orderBean != null && respose.getData().getOrderDetails() != null) { if (orderBean != null && respose.getData().getOrderDetails() != null) {
if (respose.getData().getCreateTime() != null && openTableBean != null) { if (respose.getData().getCreateTime() != null && openTableBean != null) {
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/TableAdapter.java
package com.gingersoft.gsa.cloud.table.mvp.ui.adapter; package com.gingersoft.gsa.cloud.table.mvp.ui.adapter;
import android.content.Context; import android.content.Context;
import android.graphics.Color;
import android.graphics.drawable.GradientDrawable; import android.graphics.drawable.GradientDrawable;
import android.graphics.drawable.StateListDrawable; import android.graphics.drawable.StateListDrawable;
import android.text.TextUtils; import android.text.TextUtils;
...@@ -16,21 +17,28 @@ import android.widget.TextView; ...@@ -16,21 +17,28 @@ import android.widget.TextView;
import com.gingersoft.gsa.cloud.aspectj.SingleClick; import com.gingersoft.gsa.cloud.aspectj.SingleClick;
import com.gingersoft.gsa.cloud.aspectj.XClickUtil; import com.gingersoft.gsa.cloud.aspectj.XClickUtil;
import com.gingersoft.gsa.cloud.base.common.bean.TableItem;
import com.gingersoft.gsa.cloud.base.utils.time.TimeUtil; import com.gingersoft.gsa.cloud.base.utils.time.TimeUtil;
import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils; import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils;
import com.gingersoft.gsa.cloud.table.R; import com.gingersoft.gsa.cloud.table.R;
import com.gingersoft.gsa.cloud.table.R2; import com.gingersoft.gsa.cloud.table.R2;
import com.gingersoft.gsa.cloud.base.common.bean.TableBean; import com.gingersoft.gsa.cloud.base.common.bean.TableBean;
import com.gingersoft.gsa.cloud.ui.view.TriangleLabelView;
import com.jess.arms.base.BaseHolder; import com.jess.arms.base.BaseHolder;
import com.jess.arms.base.DefaultAdapter; import com.jess.arms.base.DefaultAdapter;
import com.jess.arms.utils.ArmsUtils; import com.jess.arms.utils.ArmsUtils;
import com.qmuiteam.qmui.alpha.QMUIAlphaLinearLayout;
import com.qmuiteam.qmui.alpha.QMUIAlphaRelativeLayout; import com.qmuiteam.qmui.alpha.QMUIAlphaRelativeLayout;
import com.qmuiteam.qmui.alpha.QMUIAlphaTextView; import com.qmuiteam.qmui.alpha.QMUIAlphaTextView;
import com.qmuiteam.qmui.layout.QMUILinearLayout;
import com.qmuiteam.qmui.layout.QMUIRelativeLayout;
import com.qmuiteam.qmui.util.QMUIDisplayHelper;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import androidx.core.content.ContextCompat;
import butterknife.BindView; import butterknife.BindView;
/** /**
...@@ -60,12 +68,17 @@ public class TableAdapter extends DefaultAdapter<TableBean.DataBean> { ...@@ -60,12 +68,17 @@ public class TableAdapter extends DefaultAdapter<TableBean.DataBean> {
private int style; private int style;
private int mRadius;
private float mShadowAlpha = 0.25f;
private int mShadowElevationDp = 14;
public TableAdapter(Context context, List<TableBean.DataBean> infos, float diaplayScreenHeight, int function) { public TableAdapter(Context context, List<TableBean.DataBean> infos, float diaplayScreenHeight, int function) {
super(infos); super(infos);
this.mContext = context; this.mContext = context;
this.mFunction = function; this.mFunction = function;
this.mDiaplayScreenHeight = diaplayScreenHeight; this.mDiaplayScreenHeight = diaplayScreenHeight;
this.mTableTextSize = 20; this.mTableTextSize = 20;
this.mRadius = QMUIDisplayHelper.dp2px(context, 5);
initItemDispalyHeight(); initItemDispalyHeight();
} }
...@@ -94,13 +107,15 @@ public class TableAdapter extends DefaultAdapter<TableBean.DataBean> { ...@@ -94,13 +107,15 @@ public class TableAdapter extends DefaultAdapter<TableBean.DataBean> {
class TableItemHolder extends BaseHolder<TableBean.DataBean> { class TableItemHolder extends BaseHolder<TableBean.DataBean> {
@BindView(R2.id.ll_container) @BindView(R2.id.ll_container)
LinearLayout ll_container; QMUIRelativeLayout ll_container;
@BindView(R2.id.rl_table) @BindView(R2.id.rl_table)
QMUIAlphaRelativeLayout rl_table; QMUIAlphaRelativeLayout rl_table;
@BindView(R2.id.btn_table) @BindView(R2.id.btn_table)
TextView btn_table; TextView btn_table;
@BindView(R2.id.tv_people) @BindView(R2.id.tv_people)
TextView tv_people; TextView tv_people;
@BindView(R2.id.tv_service_fee)
TextView tv_service_fee;
@BindView(R2.id.tv_open_duration) @BindView(R2.id.tv_open_duration)
TextView tv_open_duration; TextView tv_open_duration;
// @BindView(R2.id.btn_showMain) // @BindView(R2.id.btn_showMain)
...@@ -109,6 +124,12 @@ public class TableAdapter extends DefaultAdapter<TableBean.DataBean> { ...@@ -109,6 +124,12 @@ public class TableAdapter extends DefaultAdapter<TableBean.DataBean> {
// ImageView iv_vip; // ImageView iv_vip;
// @BindView(R2.id.tv_scan_flag) // @BindView(R2.id.tv_scan_flag)
// TextView tv_scan_flag; // TextView tv_scan_flag;
@BindView(R2.id.fl_table_type)
FrameLayout fl_table_type;
@BindView(R2.id.tlv_table_type)
TriangleLabelView tlv_table_type;
@BindView(R2.id.tv_type_labe)
TextView tv_type_labe;
public TableItemHolder(View itemView) { public TableItemHolder(View itemView) {
super(itemView); super(itemView);
...@@ -121,17 +142,31 @@ public class TableAdapter extends DefaultAdapter<TableBean.DataBean> { ...@@ -121,17 +142,31 @@ public class TableAdapter extends DefaultAdapter<TableBean.DataBean> {
initItemDispalyMetrics(); initItemDispalyMetrics();
initItemTableClick(item, position); initItemTableClick(item, position);
initTableBackground(item); initTableBackground(item);
ll_container.setRadiusAndShadow(mRadius, QMUIDisplayHelper.dp2px(mContext, mShadowElevationDp), mShadowAlpha);
} }
private void initItemData(TableBean.DataBean item) { private void initItemData(TableBean.DataBean item) {
btn_table.setText(item.getTableName()); btn_table.setText(item.getTableName());
// if (item.getServiceCharge() > 0) {
// tv_service_fee.setText(item.getServiceCharge() + "%");
// tv_service_fee.setVisibility(View.VISIBLE);
// } else {
tv_service_fee.setVisibility(View.GONE);
// }
if (item.getStatus() != 0) { if (item.getStatus() != 0) {
int person = 0;
if (item.getPerson() != 0) {
person = item.getPerson();
} else {
person = item.getSeatCount();
}
tv_people.setVisibility(View.VISIBLE); tv_people.setVisibility(View.VISIBLE);
tv_people.setText(item.getPerson() + "人"); tv_people.setText(person + "人");
String createDate = item.getCreateTime(); String createDate = item.getCreateTime();
if(!TextUtils.isEmpty(createDate)) { if (!TextUtils.isEmpty(createDate)) {
String createTime = TimeUtil.getStringByFormat(new Date(createDate), TimeUtil.dateFormatYMDHMS); String createTime = TimeUtil.getStringByFormat(new Date(createDate), TimeUtil.dateFormatYMDHMS);
String currentTime = TimeUtil.getStringByFormat(System.currentTimeMillis(), TimeUtil.dateFormatYMDHMS); String currentTime = TimeUtil.getStringByFormat(System.currentTimeMillis(), TimeUtil.dateFormatYMDHMS);
long[] difference = TimeUtil.getDistanceTimes2(createTime, currentTime); long[] difference = TimeUtil.getDistanceTimes2(createTime, currentTime);
...@@ -151,6 +186,26 @@ public class TableAdapter extends DefaultAdapter<TableBean.DataBean> { ...@@ -151,6 +186,26 @@ public class TableAdapter extends DefaultAdapter<TableBean.DataBean> {
tv_people.setVisibility(View.GONE); tv_people.setVisibility(View.GONE);
tv_open_duration.setVisibility(View.GONE); tv_open_duration.setVisibility(View.GONE);
} }
if (item.getStatus() != 0) {
switch (item.getType()) {
case TableItem.TABLE_TYPE_CANTEEN:
tv_type_labe.setText("堂");
tv_type_labe.setTextColor(Color.parseColor("#249B65"));
break;
case TableItem.TABLE_TYPE_TAKEAWAY:
tv_type_labe.setText("外");
tv_type_labe.setTextColor(Color.parseColor("#FF720A"));
break;
case TableItem.TABLE_TYPE_SELF_FETCHING:
tv_type_labe.setText("自");
tv_type_labe.setTextColor(Color.parseColor("#00479D"));
break;
}
fl_table_type.setVisibility(View.VISIBLE);
} else {
fl_table_type.setVisibility(View.GONE);
}
} }
private void initTableBackground(TableBean.DataBean item) { private void initTableBackground(TableBean.DataBean item) {
...@@ -158,29 +213,50 @@ public class TableAdapter extends DefaultAdapter<TableBean.DataBean> { ...@@ -158,29 +213,50 @@ public class TableAdapter extends DefaultAdapter<TableBean.DataBean> {
// if (item.getSplitStatus() != 0) { // if (item.getSplitStatus() != 0) {
// setBackGroundWork(item, "888", R.drawable.tablebutton_splite, R.drawable.tablebutton_splite_new, R.color.black); // setBackGroundWork(item, "888", R.drawable.tablebutton_splite, R.drawable.tablebutton_splite_new, R.color.black);
// } else { // } else {
ll_container.setBackgroundColor(Color.parseColor("#FFFFFFFF"));
if (item.getUseStatus() == 1) { if (item.getUseStatus() == 1) {
setBackGroundWork(item, "999", R.drawable.table_shape_table_use, R.drawable.tablebutton_red_new, R.color.theme_white_color); setBackGroundWork(item, Color.parseColor("#FFD14141"), R.color.theme_white_color,R.color.theme_black);
} else { } else {
// switch (item.getStatus()) {
// case 0:
// setBackGroundWork(item, Color.parseColor("#FFFFFFFF"), R.color.black);
// break;
// case 1:
//// setBackGroundWork(item, "2", R.drawable.table_shape_table_send, R.drawable.tablebutton_glassgreen_new, R.color.theme_white_color); break;
// case 2:
// setBackGroundWork(item, Color.parseColor("#FF249B65"), R.color.theme_white_color);
// break;
// case 3:
// setBackGroundWork(item, Color.parseColor("#FFE5AC00"), R.color.theme_white_color);
// break;
// case 4:
// setBackGroundWork(item, ContextCompat.getColor(mContext, R.color.Violet), R.color.theme_white_color);
// break;
// case 5:
// setBackGroundWork(item, ContextCompat.getColor(mContext, R.color.Violet), R.color.theme_white_color);
// break;
// case 6:
// setBackGroundWork(item, ContextCompat.getColor(mContext, R.color.Violet), R.color.theme_white_color);
// break;
// }
switch (item.getStatus()) { switch (item.getStatus()) {
case 0: case 0:
setBackGroundWork(item, "0", R.drawable.table_shape_table_nomal, R.drawable.tablebutton_skyblue_new, R.color.black); setBackGroundWork(item, Color.parseColor("#FFFFFFFF"), R.color.black,R.color.theme_black);
break; break;
case 1: case 1:
// setBackGroundWork(item, "2", R.drawable.table_shape_table_send, R.drawable.tablebutton_glassgreen_new, R.color.theme_white_color); break; // setBackGroundWork(item, "2", R.drawable.table_shape_table_send, R.drawable.tablebutton_glassgreen_new, R.color.theme_white_color); break;
case 2: case 2:
setBackGroundWork(item, "2", R.drawable.table_shape_table_send, R.drawable.tablebutton_glassgreen_new, R.color.theme_white_color); setBackGroundWork(item, Color.parseColor("#FF249B65"), R.color.theme_white_color,R.color.theme_white_color);
break; break;
case 3: case 3:
setBackGroundWork(item, "3", R.drawable.table_shape_table_print, R.drawable.tablebutton_yellow_new, R.color.theme_white_color); setBackGroundWork(item, Color.parseColor("#FFE5AC00"), R.color.theme_white_color,R.color.theme_white_color);
break; break;
case 4: case 4:
setBackGroundWork(item, "4", R.drawable.tablebutton_violet, R.drawable.tablebutton_violet_new, R.color.theme_white_color);
break;
case 5: case 5:
setBackGroundWork(item, "5", R.drawable.tablebutton_default, R.drawable.tablebutton_default_new, R.color.theme_white_color);
break;
case 6: case 6:
setBackGroundWork(item, "6", R.drawable.tablebutton_default, R.drawable.tablebutton_default_new, R.color.theme_white_color); setBackGroundWork(item, ContextCompat.getColor(mContext, R.color.Violet), R.color.theme_white_color,R.color.theme_white_color);
break; break;
} }
} }
...@@ -204,166 +280,38 @@ public class TableAdapter extends DefaultAdapter<TableBean.DataBean> { ...@@ -204,166 +280,38 @@ public class TableAdapter extends DefaultAdapter<TableBean.DataBean> {
private void initItemDispalyMetrics() { private void initItemDispalyMetrics() {
if (btn_table.getGravity() != Gravity.CENTER) { if (btn_table.getGravity() != Gravity.CENTER) {
rl_table.setGravity(Gravity.CENTER); rl_table.setGravity(Gravity.CENTER);
LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) rl_table.getLayoutParams(); RelativeLayout.LayoutParams lp = (RelativeLayout.LayoutParams) rl_table.getLayoutParams();
lp.height = ItemColHeight; lp.height = ItemColHeight;
rl_table.setLayoutParams(lp); rl_table.setLayoutParams(lp);
} }
LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) rl_table.getLayoutParams(); RelativeLayout.LayoutParams lp = (RelativeLayout.LayoutParams) rl_table.getLayoutParams();
rl_table.setLayoutParams(lp); rl_table.setLayoutParams(lp);
rl_table.setMinimumHeight(ItemColHeight); rl_table.setMinimumHeight(ItemColHeight);
LinearLayout.LayoutParams relativeLayout = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT); RelativeLayout.LayoutParams relativeLayout = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, RelativeLayout.LayoutParams.MATCH_PARENT);
relativeLayout.height = ItemColHeight; relativeLayout.height = ItemColHeight;
rl_table.setLayoutParams(relativeLayout); rl_table.setLayoutParams(relativeLayout);
} }
private void setBackGroundWork(TableBean.DataBean item, String workstatu, int defaultMainback, int defaultChildBack, int defaultFontColor) { // private void setBackGroundWork(TableBean.DataBean item, String workstatu, int defaultMainback, int defaultChildBack, int defaultFontColor) {
// if (defaultMainback != -1) {
// ll_container.setBackground(mContext.getResources().getDrawable(defaultMainback));
// }
//// if (defaultChildBack != -1) {
//// btn_table.setBackground(mContext.getResources().getDrawable(defaultMainback));
//// btn_showMain.setBackground(mContext.getResources().getDrawable(defaultMainback));
//// }
// btn_table.setTextColor(mContext.getResources().getColor(defaultFontColor));
//// btn_showMain.setTextColor(mContext.getResources().getColor(defaultFontColor));
// }
private void setBackGroundWork(TableBean.DataBean item, int defaultMainback, int defaultFontColor,int serviceFeeFontColor) {
if (defaultMainback != -1) { if (defaultMainback != -1) {
ll_container.setBackground(mContext.getResources().getDrawable(defaultMainback)); ll_container.setBackgroundColor(defaultMainback);
} }
// if (defaultChildBack != -1) {
// btn_table.setBackground(mContext.getResources().getDrawable(defaultMainback));
// btn_showMain.setBackground(mContext.getResources().getDrawable(defaultMainback));
// }
btn_table.setTextColor(mContext.getResources().getColor(defaultFontColor)); btn_table.setTextColor(mContext.getResources().getColor(defaultFontColor));
// btn_showMain.setTextColor(mContext.getResources().getColor(defaultFontColor)); tv_service_fee.setTextColor(mContext.getResources().getColor(serviceFeeFontColor));
/**
* 可使用 0
* 操作中 1
* 已開台 2
* 已印單 3
* 已結賬 4
* 連台 6
*/
// StateListDrawable bgShape = (StateListDrawable) btn_table.getBackground();
// GradientDrawable d = (GradientDrawable) bgShape.getCurrent();
// switch (workstatu) {
// case "0":
// d.setColor(ArmsUtils.getColor(mContext, R.color.table_normal));
// break;
// case "1":
// case "2":
// d.setColor(ArmsUtils.getColor(mContext, R.color.table_send));
// break;
// case "3":
// d.setColor(ArmsUtils.getColor(mContext, R.color.table_print));
// break;
// case "4":
// d.setColor(ArmsUtils.getColor(mContext, R.color.table_normal));
// break;
// case "5":
// d.setColor(ArmsUtils.getColor(mContext, R.color.table_normal));
// break;
// case "6":
// d.setColor(ArmsUtils.getColor(mContext, R.color.Violet));
// break;
// case "999":
// d.setColor(ArmsUtils.getColor(mContext, R.color.table_use));
// break;
//
// }
// com.elegant.bin.gsa.mvp.main.model.bean.Color.DatasBean cs;
//
// for (TableWorkStatusColor tws : GSAApplication.androidSetting.getTableWorkStatusColors()) {
// if (tws.getWorkstatu().equalsIgnoreCase(workstatu)) {
// cs = AndroidSettingUtils.getColorById(tws.getColorid());
// if (cs != null) {
// StateListDrawable bgShape = (StateListDrawable) btn_table.getBackground();
// int[] states = bgShape.getState();
// for (int i = 0; i < states.length; i++) {
// if (states[i] == android.R.attr.state_focused || states[i] == android.R.attr.state_enabled) {
// GradientDrawable d = (GradientDrawable) bgShape.getCurrent();
// if (!TextUtils.isEmpty(cs.getAndroidColor())) {
// d.setColor(Color.parseColor(cs.getAndroidColor()));
// } else {
// d.setColor(ArmsUtils.getColor(mContext, R.color.Grass_green));
// }
// }
// }
// bgShape = (StateListDrawable) btn_showMain.getBackground();
// states = bgShape.getState();
// for (int i = 0; i < states.length; i++) {
// if (states[i] == android.R.attr.state_focused || states[i] == android.R.attr.state_enabled) {
// GradientDrawable d = (GradientDrawable) bgShape.getCurrent();
// if (!TextUtils.isEmpty(cs.getAndroidColor())) {
// d.setColor(Color.parseColor(cs.getAndroidColor()));
// } else {
//// d.setColor(Color.parseColor(""));
// }
// }
// }
// if (!TextUtils.isEmpty(cs.getAndroidfontcolor())) {
// btn_table.setTextColor(Color.parseColor(cs.getAndroidfontcolor()));
// btn_showMain.setTextColor(Color.parseColor(cs.getAndroidfontcolor()));
// }
// }
// break;
// }
// }
// if (item.getSplitStatus() == 1 || item.isUsing()) {
// return;
// }
// switch (item.getStatus()) {
// case 2://开台状态下要增加随时时间增加，改变色的功能
// for (TableStatusOpenedOverTime tws : GSAApplication.androidSetting.getTableStatusOpenedOverTimeColors()) {
// if (item.getOropentime_diff() >= tws.times) {
// cs = AndroidSettingUtils.getColorById(tws.getColorid());
// if (cs != null) {
// StateListDrawable bgShape = (StateListDrawable) btn_table.getBackground();
// int[] states = bgShape.getState();
// for (int i = 0; i < states.length; i++) {
// if (states[i] == android.R.attr.state_focused || states[i] == android.R.attr.state_enabled) {
// GradientDrawable d = (GradientDrawable) bgShape.getCurrent();
// d.setColor(Color.parseColor(cs.getAndroidColor()));
// }
// }
// bgShape = (StateListDrawable) btn_showMain.getBackground();
// states = bgShape.getState();
// for (int i = 0; i < states.length; i++) {
// if (states[i] == android.R.attr.state_focused || states[i] == android.R.attr.state_enabled) {
// GradientDrawable d = (GradientDrawable) bgShape.getCurrent();
// d.setColor(Color.parseColor(cs.getAndroidColor()));
// }
// }
// btn_table.setTextColor(Color.parseColor(cs.getAndroidfontcolor()));
// btn_showMain.setTextColor(Color.parseColor(cs.getAndroidfontcolor()));
// }
// //break;
// }
// }
// break;
// case 3://印单状态下要增加随时间增加，改变色的功能
// for (TableStatusPrintedOverTime tws : GSAApplication.androidSetting.getTableStatusPrintedOverTimeColors()) {
// if (item.getOropentime_diff() >= tws.times) {
// cs = AndroidSettingUtils.getColorById(tws.getColorid());
// if (cs != null) {
// StateListDrawable bgShape = (StateListDrawable) btn_table.getBackground();
// int[] states = bgShape.getState();
// for (int i = 0; i < states.length; i++) {
// if (states[i] == android.R.attr.state_focused || states[i] == android.R.attr.state_enabled) {
// GradientDrawable d = (GradientDrawable) bgShape.getCurrent();
// d.setColor(Color.parseColor(cs.getAndroidColor()));
// }
// }
// bgShape = (StateListDrawable) btn_showMain.getBackground();
// states = bgShape.getState();
// for (int i = 0; i < states.length; i++) {
// if (states[i] == android.R.attr.state_focused || states[i] == android.R.attr.state_enabled) {
// GradientDrawable d = (GradientDrawable) bgShape.getCurrent();
// d.setColor(Color.parseColor(cs.getAndroidColor()));
// }
// }
// btn_table.setTextColor(Color.parseColor(cs.getAndroidfontcolor()));
// btn_showMain.setTextColor(Color.parseColor(cs.getAndroidfontcolor()));
// }
// //break;
// }
// }
// break;
// }
// }
} }
} }
......
table-module/src/main/res/layout/table_recycler_table.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <com.qmuiteam.qmui.layout.QMUIRelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/ll_container" android:id="@+id/ll_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
android:orientation="vertical" android:orientation="vertical"
android:layout_margin="@dimen/dp_2"> android:layout_margin="@dimen/dp_2"
android:background="@color/theme_white_color">
<com.qmuiteam.qmui.alpha.QMUIAlphaRelativeLayout <com.qmuiteam.qmui.alpha.QMUIAlphaRelativeLayout
android:id="@+id/rl_table" android:id="@+id/rl_table"
...@@ -36,11 +38,22 @@ ...@@ -36,11 +38,22 @@
android:visibility="gone"/> android:visibility="gone"/>
<TextView <TextView
android:id="@+id/tv_service_fee"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp_2"
android:layout_below="@+id/tv_people"
android:text=""
android:textColor="@color/theme_text_pice_color"
android:textSize="@dimen/sp_13" />
<TextView
android:id="@+id/tv_open_duration" android:id="@+id/tv_open_duration"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="30:00" android:text="30:00"
android:layout_below="@+id/tv_people" android:layout_below="@+id/tv_service_fee"
android:textSize="@dimen/sp_12" android:textSize="@dimen/sp_12"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:drawableLeft="@mipmap/ic_table_open_time" android:drawableLeft="@mipmap/ic_table_open_time"
...@@ -64,6 +77,34 @@ ...@@ -64,6 +77,34 @@
<!-- android:visibility="gone" />--> <!-- android:visibility="gone" />-->
</com.qmuiteam.qmui.alpha.QMUIAlphaRelativeLayout> </com.qmuiteam.qmui.alpha.QMUIAlphaRelativeLayout>
<FrameLayout
android:id="@+id/fl_table_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:visibility="gone">
<com.gingersoft.gsa.cloud.ui.view.TriangleLabelView
android:id="@+id/tlv_table_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:backgroundColor="@color/theme_white_color"
app:corner="rightBottom"
app:primaryText="堂"
app:primaryTextColor="#249B65"
app:primaryTextSize="10sp" />
<TextView
android:id="@+id/tv_type_labe"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right|bottom"
android:text="堂"
android:textColor="#249B65"
android:textSize="10sp"
android:padding="@dimen/dp_5"/>
</FrameLayout>
<!-- <ImageView--> <!-- <ImageView-->
<!-- android:id="@+id/iv_vip"--> <!-- android:id="@+id/iv_vip"-->
<!-- android:layout_width="50dp"--> <!-- android:layout_width="50dp"-->
...@@ -86,4 +127,4 @@ ...@@ -86,4 +127,4 @@
<!-- android:gravity="center"--> <!-- android:gravity="center"-->
<!-- android:visibility="gone"--> <!-- android:visibility="gone"-->
<!-- android:textSize="@dimen/font_normal2" />--> <!-- android:textSize="@dimen/font_normal2" />-->
</LinearLayout> </com.qmuiteam.qmui.layout.QMUIRelativeLayout>
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