Skip to content

S
supplier
Commit ea569098 by Wyh
Options

Merge remote-tracking branch 'origin/master'

parents 65c6b704 6cd36497
Showing with 56 additions and 59 deletions
config.gradle
...@@ -5,8 +5,8 @@ ext { ...@@ -5,8 +5,8 @@ ext {
buildToolsVersion: '28.0.3', buildToolsVersion: '28.0.3',
minSdkVersion : 19, //N5收銀機應用安卓開發環境要求Android OS Version: 5.1Android SDK Min Version: 19 minSdkVersion : 19, //N5收銀機應用安卓開發環境要求Android OS Version: 5.1Android SDK Min Version: 19
targetSdkVersion : 28, targetSdkVersion : 28,
versionCode : 5, versionCode : 1,
versionName : "1.0.5" versionName : "1.0.0"
] ]
version = [ version = [
......
main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/NewMainActivity.java
...@@ -122,7 +122,7 @@ public class NewMainActivity extends BaseFragmentActivity<NewMainPresenter> impl ...@@ -122,7 +122,7 @@ public class NewMainActivity extends BaseFragmentActivity<NewMainPresenter> impl
@Override @Override
public void onCreate(@Nullable Bundle savedInstanceState) { public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
mPresenter.checkAppVersion(); // mPresenter.checkAppVersion();
} }
@Override @Override
......
manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/ui/fragment/AddTableFragment.java
...@@ -96,7 +96,7 @@ public class AddTableFragment extends BaseFragment<AddTablePresenter> implements ...@@ -96,7 +96,7 @@ public class AddTableFragment extends BaseFragment<AddTablePresenter> implements
@Override @Override
public void onCreate(@Nullable Bundle savedInstanceState) { public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);;
mTableItem = (TableItem) getArguments().getSerializable(TABLE_AREA); mTableItem = (TableItem) getArguments().getSerializable(TABLE_AREA);
} }
...@@ -290,7 +290,7 @@ public class AddTableFragment extends BaseFragment<AddTablePresenter> implements ...@@ -290,7 +290,7 @@ public class AddTableFragment extends BaseFragment<AddTablePresenter> implements
QMUICommonListItemView serverchargeItemView = mGroupListView.createItemView("服務費%"); QMUICommonListItemView serverchargeItemView = mGroupListView.createItemView("服務費%");
serverchargeItemView.setAccessoryType(QMUICommonListItemView.ACCESSORY_TYPE_CUSTOM); serverchargeItemView.setAccessoryType(QMUICommonListItemView.ACCESSORY_TYPE_CUSTOM);
serverchargeEditText = new EditText(mContext); serverchargeEditText = new EditText(mContext);
serverchargeEditText.setHint("请输入服务费"); serverchargeEditText.setHint("請輸入服務費");
if (mTableItem.getLayoutType() == 0 && mTableItem.getServiceCharge() != 0) { if (mTableItem.getLayoutType() == 0 && mTableItem.getServiceCharge() != 0) {
serverchargeEditText.setText(mTableItem.getServiceCharge() + ""); serverchargeEditText.setText(mTableItem.getServiceCharge() + "");
} }
......
manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/ui/fragment/AreaListFragment.java
...@@ -161,12 +161,12 @@ public class AreaListFragment extends BaseFragment<AreaListPresenter> implements ...@@ -161,12 +161,12 @@ public class AreaListFragment extends BaseFragment<AreaListPresenter> implements
changeHelper.addOnKeyboardShowListener(new KeyboardChangeHelper.OnKeyboardShowListener() { changeHelper.addOnKeyboardShowListener(new KeyboardChangeHelper.OnKeyboardShowListener() {
@Override @Override
public void onKeyboardShow() { public void onKeyboardShow() {
fl_add_area.setVisibility(View.INVISIBLE); // fl_add_area.setVisibility(View.INVISIBLE);
} }
@Override @Override
public void onKeyboardHide() { public void onKeyboardHide() {
fl_add_area.setVisibility(View.VISIBLE); // fl_add_area.setVisibility(View.VISIBLE);
} }
}); });
} }
......
manager-module/src/main/res/layout/fragment_area_list.xml
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
android:orientation="horizontal" android:orientation="horizontal"
android:paddingLeft="@dimen/dp_15" android:paddingLeft="@dimen/dp_15"
android:paddingRight="@dimen/dp_15" android:paddingRight="@dimen/dp_15"
android:visibility="visible"> android:visibility="gone">
<CheckBox <CheckBox
android:id="@+id/cb_all_select" android:id="@+id/cb_all_select"
......
manager-module/src/main/res/layout/fragment_table_list.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<com.qmuiteam.qmui.widget.QMUIWindowInsetLayout xmlns:android="http://schemas.android.com/apk/res/android" <com.qmuiteam.qmui.widget.QMUIWindowInsetLayout 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"
xmlns:tools="http://schemas.android.com/tools"
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">
...@@ -15,16 +14,14 @@ ...@@ -15,16 +14,14 @@
<FrameLayout <FrameLayout
android:id="@+id/frameLayout" android:id="@+id/frameLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
android:layout_marginBottom="@dimen/dp_40">
<com.scwang.smartrefresh.layout.SmartRefreshLayout <com.scwang.smartrefresh.layout.SmartRefreshLayout
android:id="@+id/refreshLayout" android:id="@+id/refreshLayout"
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" app:srlEnableRefresh="false">
android:layout_marginBottom="@dimen/dp_10">
<com.qmuiteam.qmui.widget.section.QMUIStickySectionLayout <com.qmuiteam.qmui.widget.section.QMUIStickySectionLayout
android:id="@+id/section_table" android:id="@+id/section_table"
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/TablePresenter.java
...@@ -154,56 +154,56 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont ...@@ -154,56 +154,56 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
@Override @Override
public void onItemClick(View view, int viewType, Object data, int position) { public void onItemClick(View view, int viewType, Object data, int position) {
Function function = (Function) data; // Function function = (Function) data;
switch (function.getStatus()) { // switch (function.getStatus()) {
case STATUS_NONACTIVATED: // case STATUS_NONACTIVATED:
mRootView.showMessage("服務暫未開通,敬請期待"); // mRootView.showMessage("服務暫未開通,敬請期待");
return; // return;
case STATUS_TIME_LIMIT: // case STATUS_TIME_LIMIT:
mRootView.showMessage("服務已到期,請前往續費"); // mRootView.showMessage("服務已到期,請前往續費");
return; // return;
} // }
if (function.getResUrl().equals(ComponentTable.table.bottom[0].getKeyRes())) { // if (function.getResUrl().equals(ComponentTable.table.bottom[0].getKeyRes())) {
//重置 // //重置
mRootView.setCurrentOperatType(TableOperatTypeConstant.init_table_3); // mRootView.setCurrentOperatType(TableOperatTypeConstant.init_table_3);
} else if (function.getResUrl().equals(ComponentTable.table.bottom[1].getKeyRes())) { // } else if (function.getResUrl().equals(ComponentTable.table.bottom[1].getKeyRes())) {
//轉檯 // //轉檯
mRootView.setCurrentOperatType(TableOperatTypeConstant.move_table_4); // mRootView.setCurrentOperatType(TableOperatTypeConstant.move_table_4);
} else if (function.getResUrl().equals(ComponentTable.table.bottom[3].getKeyRes())) { // } else if (function.getResUrl().equals(ComponentTable.table.bottom[3].getKeyRes())) {
//上菜紙 // //上菜紙
mRootView.setCurrentOperatType(TableOperatTypeConstant.print_parper_2); // mRootView.setCurrentOperatType(TableOperatTypeConstant.print_parper_2);
} // }
// switch (position) { switch (position) {
// case 0: case 0:
// //重置 //重置
// mRootView.setCurrentOperatType(TableOperatTypeConstant.init_table_3); mRootView.setCurrentOperatType(TableOperatTypeConstant.init_table_3);
// break; break;
// case 1: case 1:
// //轉檯 //轉檯
// mRootView.setCurrentOperatType(TableOperatTypeConstant.move_table_4); mRootView.setCurrentOperatType(TableOperatTypeConstant.move_table_4);
// break; break;
// case 2: case 2:
// //上菜紙 //上菜紙
// mRootView.setCurrentOperatType(TableOperatTypeConstant.print_parper_2); mRootView.setCurrentOperatType(TableOperatTypeConstant.print_parper_2);
// break; break;
// } }
} }
}); });
} }
public void initBottomFunctionItem() { public void initBottomFunctionItem() {
List<Function> functions = FunctionManager.getDefault().getFunctionByResModule(IActivity, ComponentTable.table.class, ComponentTable.table.bottom, "bottom"); // List<Function> functions = FunctionManager.getDefault().getFunctionByResModule(IActivity, ComponentTable.table.class, ComponentTable.table.bottom, "bottom");
for (int i = 0; i < functions.size(); i++) { // for (int i = 0; i < functions.size(); i++) {
if (functions.get(i).getParentId() == 0) { // if (functions.get(i).getParentId() == 0) {
functions.remove(i); // functions.remove(i);
} // }
} // }
mBottomFunctionList.addAll(functions); // mBottomFunctionList.addAll(functions);
// mBottomFunctionList.add(new Function((long) 1, "重置檯號", ArmsUtils.getColor(IActivity, R.color.theme_black), ArmsUtils.getDimens(IActivity, R.dimen.sp_14), R.mipmap.table_init)); mBottomFunctionList.add(new Function((long) 1, "重置檯號", ArmsUtils.getColor(IActivity, R.color.theme_black), ArmsUtils.getDimens(IActivity, R.dimen.sp_14), R.mipmap.table_init));
// mBottomFunctionList.add(new Function((long) 2, "轉檯", ArmsUtils.getColor(IActivity, R.color.theme_black), ArmsUtils.getDimens(IActivity, R.dimen.sp_14), R.mipmap.table_move)); mBottomFunctionList.add(new Function((long) 2, "轉檯", ArmsUtils.getColor(IActivity, R.color.theme_black), ArmsUtils.getDimens(IActivity, R.dimen.sp_14), R.mipmap.table_move));
// mBottomFunctionList.add(new Function((long) 3, "分檯", ArmsUtils.getColor(IActivity, R.color.theme_black), ArmsUtils.getDimens(IActivity, R.dimen.sp_14), R.mipmap.table_splite)); // mBottomFunctionList.add(new Function((long) 3, "分檯", ArmsUtils.getColor(IActivity, R.color.theme_black), ArmsUtils.getDimens(IActivity, R.dimen.sp_14), R.mipmap.table_splite));
// mBottomFunctionList.add(new Function((long) 4, "skyorder", ArmsUtils.getColor(IActivity, R.color.theme_black), ArmsUtils.getDimens(IActivity, R.dimen.sp_14), R.mipmap.table_skyorder)); // mBottomFunctionList.add(new Function((long) 4, "skyorder", ArmsUtils.getColor(IActivity, R.color.theme_black), ArmsUtils.getDimens(IActivity, R.dimen.sp_14), R.mipmap.table_skyorder));
// mBottomFunctionList.add(new Function((long) 5, "上菜紙", ArmsUtils.getColor(IActivity, R.color.theme_black), ArmsUtils.getDimens(IActivity, R.dimen.sp_14), R.mipmap.table_paper)); mBottomFunctionList.add(new Function((long) 5, "上菜紙", ArmsUtils.getColor(IActivity, R.color.theme_black), ArmsUtils.getDimens(IActivity, R.dimen.sp_14), R.mipmap.table_paper));
} }
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/MealStandActivity.java
...@@ -272,7 +272,7 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter> ...@@ -272,7 +272,7 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter>
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
OrderBean order = MyOrderManage.getInstance().getOrderBean(); OrderBean order = MyOrderManage.getInstance().getOrderBean();
if(order != null) { if(order != null) {
ArmsUtils.snackbarText("訂單ID:" + order.getId()); // ArmsUtils.snackbarText("訂單ID:" + order.getId());
} }
} }
...@@ -625,7 +625,7 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter> ...@@ -625,7 +625,7 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter>
case 5: case 5:
OrderBean order = MyOrderManage.getInstance().getOrderBean(); OrderBean order = MyOrderManage.getInstance().getOrderBean();
if(order != null) { if(order != null) {
ArmsUtils.snackbarText("訂單ID:" + order.getId()); // ArmsUtils.snackbarText("訂單ID:" + order.getId());
} }
mPresenter.changeNumber(i); mPresenter.changeNumber(i);
break; break;
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/BottomFunctionAdapter.java
...@@ -69,7 +69,7 @@ public class BottomFunctionAdapter extends DefaultAdapter<Function> { ...@@ -69,7 +69,7 @@ public class BottomFunctionAdapter extends DefaultAdapter<Function> {
private void initItemData(Function item) { private void initItemData(Function item) {
tv_name.setText(item.getResName()); tv_name.setText(item.getResName());
iv_icon.setImageResource(item.getIcRes()); iv_icon.setImageResource(item.getIconRes());
} }
} }
......
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