Skip to content

S
supplier
Commit c0ae1b36 by 宁斌
Options

1、1.0.4正式包代码

parent e4829c0e
Showing with 32 additions and 20 deletions
config.gradle
...@@ -7,8 +7,8 @@ ext { ...@@ -7,8 +7,8 @@ ext {
targetSdkVersion : 28, targetSdkVersion : 28,
//正式版: 1.0.3 3 //正式版: 1.0.3 3
//內部測試版:1.2.0 20 //內部測試版:1.2.0 20
versionCode : 5, versionCode : 4,
versionName : "1.0.5" versionName : "1.0.4"
] ]
version = [ version = [
......
login-module/src/main/java/com/gingersoft/gsa/cloud/login/mvp/contract/LoginInterfaceImpl.java
...@@ -56,8 +56,8 @@ public abstract class LoginInterfaceImpl<P extends BaseLoginPresenter> extends B ...@@ -56,8 +56,8 @@ public abstract class LoginInterfaceImpl<P extends BaseLoginPresenter> extends B
int restaurantId = GsaCloudApplication.getRestaurantId(this); int restaurantId = GsaCloudApplication.getRestaurantId(this);
if (restaurantId != 0) { if (restaurantId != 0) {
//上一次進入app有選擇餐廳，通過餐廳ID獲取允許的最大登陸數 //上一次進入app有選擇餐廳，通過餐廳ID獲取允許的最大登陸數
mPresenter.getLoginLimit(restaurantId, false); // mPresenter.getLoginLimit(restaurantId, false);
// jumpMainActivity(); jumpMainActivity();
return; return;
} }
} }
...@@ -69,9 +69,9 @@ public abstract class LoginInterfaceImpl<P extends BaseLoginPresenter> extends B ...@@ -69,9 +69,9 @@ public abstract class LoginInterfaceImpl<P extends BaseLoginPresenter> extends B
if (brandsBean != null) { if (brandsBean != null) {
saveBrandAndRestaurantInfo(brandsBean.getBrandId(), brandsBean.getBrandName(), restaurantsBean); saveBrandAndRestaurantInfo(brandsBean.getBrandId(), brandsBean.getBrandName(), restaurantsBean);
//通過餐廳ID獲取允許的最大登陸數 //通過餐廳ID獲取允許的最大登陸數
mPresenter.getLoginLimit(restaurantsBean.getRestaurantId(), true); // mPresenter.getLoginLimit(restaurantsBean.getRestaurantId(), true);
} }
// jumpDownloadActivity(); jumpDownloadActivity();
} else { } else {
showChooseRestaurantDialog(brandsBeans, brands); showChooseRestaurantDialog(brandsBeans, brands);
} }
...@@ -99,10 +99,10 @@ public abstract class LoginInterfaceImpl<P extends BaseLoginPresenter> extends B ...@@ -99,10 +99,10 @@ public abstract class LoginInterfaceImpl<P extends BaseLoginPresenter> extends B
BrandsBean.BrandsData brandsBean = RestaurantInfoUtils.getBrandByRestaurantId(brands, item.getRestaurantId()); BrandsBean.BrandsData brandsBean = RestaurantInfoUtils.getBrandByRestaurantId(brands, item.getRestaurantId());
if (brandsBean != null) { if (brandsBean != null) {
saveBrandAndRestaurantInfo(brandsBean.getBrandId(), brandsBean.getBrandName(), item); saveBrandAndRestaurantInfo(brandsBean.getBrandId(), brandsBean.getBrandName(), item);
mPresenter.getLoginLimit(item.getRestaurantId(), true); // mPresenter.getLoginLimit(item.getRestaurantId(), true);
} }
dialog.dismiss(); dialog.dismiss();
// jumpDownloadActivity(); jumpDownloadActivity();
} }
protected void saveBrandAndRestaurantInfo(int brandId, String brandName, BrandsBean.BrandsData.RestaurantsBean restaurantsBean) { protected void saveBrandAndRestaurantInfo(int brandId, String brandName, BrandsBean.BrandsData.RestaurantsBean restaurantsBean) {
......
main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/NewMainActivity.java
...@@ -257,7 +257,6 @@ public class NewMainActivity extends BaseFragmentActivity<NewMainPresenter> impl ...@@ -257,7 +257,6 @@ public class NewMainActivity extends BaseFragmentActivity<NewMainPresenter> impl
// functions.add(new Function((long) 141, 150, 5, "預點餐模式", R.drawable.ic_pre_order_mode_close, 1)); // functions.add(new Function((long) 141, 150, 5, "預點餐模式", R.drawable.ic_pre_order_mode_close, 1));
functions.add(new Function((long) 151, 0, 5, "管理", 0, 0)); functions.add(new Function((long) 151, 0, 5, "管理", 0, 0));
if (BuildConfig.DEBUG) { if (BuildConfig.DEBUG) {
functions.add(new Function((long) 142, 151, 5, "賬單管理", R.drawable.ic_meals_menu_management, 0)); functions.add(new Function((long) 142, 151, 5, "賬單管理", R.drawable.ic_meals_menu_management, 0));
functions.add(new Function((long) 143, 151, 5, "餐檯管理", R.drawable.ic_dining_table_management, 0)); functions.add(new Function((long) 143, 151, 5, "餐檯管理", R.drawable.ic_dining_table_management, 0));
} }
......
manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/ui/fragment/AddTableFragment.java
...@@ -14,6 +14,7 @@ import android.widget.Button; ...@@ -14,6 +14,7 @@ import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
import android.widget.FrameLayout; import android.widget.FrameLayout;
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.base.common.bean.TableItem;
import com.gingersoft.gsa.cloud.manager.R2; import com.gingersoft.gsa.cloud.manager.R2;
...@@ -33,10 +34,12 @@ import com.qmuiteam.qmui.widget.QMUITopBarLayout; ...@@ -33,10 +34,12 @@ 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 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 butterknife.BindView; import butterknife.BindView;
import static com.jess.arms.utils.Preconditions.checkNotNull; import static com.jess.arms.utils.Preconditions.checkNotNull;
...@@ -98,7 +101,8 @@ public class AddTableFragment extends BaseFragment<AddTablePresenter> implements ...@@ -98,7 +101,8 @@ 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);
} }
...@@ -167,7 +171,7 @@ public class AddTableFragment extends BaseFragment<AddTablePresenter> implements ...@@ -167,7 +171,7 @@ public class AddTableFragment extends BaseFragment<AddTablePresenter> implements
tableNameItemView.addAccessoryCustomView(tableNameEditText); tableNameItemView.addAccessoryCustomView(tableNameEditText);
FrameLayout.LayoutParams tableNameEditTextParams = (FrameLayout.LayoutParams) tableNameEditText.getLayoutParams(); FrameLayout.LayoutParams tableNameEditTextParams = (FrameLayout.LayoutParams) tableNameEditText.getLayoutParams();
tableNameEditTextParams.width = QMUIDisplayHelper.dp2px(mContext,200); tableNameEditTextParams.width = QMUIDisplayHelper.dp2px(mContext, 200);
tableNameEditText.setLayoutParams(tableNameEditTextParams); tableNameEditText.setLayoutParams(tableNameEditTextParams);
// 如下是内容为空的配置，需要两个属性结合使用；如果有默认值，进行相反的配置 // 如下是内容为空的配置，需要两个属性结合使用；如果有默认值，进行相反的配置
// 设置文字的对齐方式 // 设置文字的对齐方式
...@@ -372,7 +376,7 @@ public class AddTableFragment extends BaseFragment<AddTablePresenter> implements ...@@ -372,7 +376,7 @@ public class AddTableFragment extends BaseFragment<AddTablePresenter> implements
private String getAreaName() { private String getAreaName() {
String areaName = mTableItem.getRegionName(); String areaName = mTableItem.getRegionName();
if(TextUtils.isEmpty(areaName)){ if (TextUtils.isEmpty(areaName)) {
areaName = "默認"; areaName = "默認";
} }
currentAreaId = mTableItem.getRegionId(); currentAreaId = mTableItem.getRegionId();
...@@ -471,7 +475,11 @@ public class AddTableFragment extends BaseFragment<AddTablePresenter> implements ...@@ -471,7 +475,11 @@ public class AddTableFragment extends BaseFragment<AddTablePresenter> implements
showMessage("請輸入餐檯名稱"); showMessage("請輸入餐檯名稱");
return false; return false;
} }
if (Integer.parseInt(peopleMixNumberEditText.getText().toString()) > Integer.parseInt(peopleMaxNumberEditText.getText().toString())) { String peopleMixNumber = peopleMixNumberEditText.getText().toString();
String peopleMaxNumber = peopleMaxNumberEditText.getText().toString();
if (!TextUtils.isEmpty(peopleMixNumber)
&& !TextUtils.isEmpty(peopleMaxNumber)
&& Integer.parseInt(peopleMixNumber) > Integer.parseInt(peopleMaxNumber)) {
showMessage("最少人数不能大于最小人数!"); showMessage("最少人数不能大于最小人数!");
return false; return false;
} }
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/TablePresenter.java
...@@ -602,13 +602,7 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont ...@@ -602,13 +602,7 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
getTables(false, null); getTables(false, null);
if (!TextUtils.isEmpty(tableNumber)) { refreshSplitTablesDialog();
SplitTableDialog splitTableDialog = IActivity.getSplitTableDialog();
if (splitTableDialog != null) {
//重置分檯成功,刷新餐檯
getSplitTables(splitTableDialog.getMainTableId());
}
}
} else { } else {
if (showMessage) if (showMessage)
mRootView.showMessage(respose.getErrMsg()); mRootView.showMessage(respose.getErrMsg());
...@@ -739,6 +733,17 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont ...@@ -739,6 +733,17 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
} }
/** /**
* 刷新分檯数据
*/
private void refreshSplitTablesDialog(){
SplitTableDialog splitTableDialog = IActivity.getSplitTableDialog();
if (splitTableDialog != null) {
//刷新餐檯
getSplitTables(splitTableDialog.getMainTableId());
}
}
/**
* 根据操作类型过滤一遍餐台 * 根据操作类型过滤一遍餐台
*/ */
public void filterTableByOperatType() { public void filterTableByOperatType() {
......
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