|
|
@@ -83,6 +83,7 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
|
|
|
// model.setAs_id("0");
|
|
|
model.setAs_companyid(as_companyid);
|
|
|
model.setAs_booknumber("");
|
|
|
+ model.setAs_maxperson("");
|
|
|
tableList.add(model);
|
|
|
myAdapter.notifyDataSetChanged();
|
|
|
}else{
|
|
|
@@ -100,6 +101,7 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
|
|
|
model.setAs_type(JSON.parseObject(updateData).getString("as_type"));
|
|
|
model.setAs_remark(JSON.parseObject(updateData).getString("as_remark"));
|
|
|
model.setAs_booknumber(JSON.parseObject(updateData).getString("as_booknumber"));
|
|
|
+ model.setAs_maxperson(JSON.parseObject(updateData).getString("as_maxperson"));
|
|
|
tableList.add(model);
|
|
|
myAdapter.notifyDataSetChanged();
|
|
|
}
|
|
|
@@ -136,6 +138,7 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
|
|
|
model.setAs_remark("");
|
|
|
model.setAs_id("0");
|
|
|
model.setAs_companyid(as_companyid);
|
|
|
+ model.setAs_maxperson("");
|
|
|
tableList.add(model);
|
|
|
myAdapter.notifyDataSetChanged();
|
|
|
}else if (id == R.id.save_bt){
|
|
|
@@ -226,7 +229,8 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
|
|
|
if (!StringUtil.isEmpty(tableList.get(c_size-1).getAs_deskcode()) &&
|
|
|
!StringUtil.isEmpty(tableList.get(c_size-1).getAs_remark()) &&
|
|
|
!StringUtil.isEmpty(tableList.get(c_size-1).getAs_number()) &&
|
|
|
- !StringUtil.isEmpty(tableList.get(c_size-1).getAs_booknumber())){
|
|
|
+ !StringUtil.isEmpty(tableList.get(c_size-1).getAs_booknumber())&&
|
|
|
+ !StringUtil.isEmpty(tableList.get(c_size-1).getAs_maxperson())){
|
|
|
canOrNot = true;
|
|
|
}else {
|
|
|
ToastMessage("请输全设置信息");
|
|
|
@@ -268,7 +272,11 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
|
|
|
tableView.number_et = (FormEditText) convertView.findViewById(R.id.number_et);
|
|
|
tableView.remark_et = (FormEditText) convertView.findViewById(R.id.remark_et);
|
|
|
tableView.days_et = (FormEditText) convertView.findViewById(R.id.days_et);
|
|
|
+ tableView.maxperson_et = (FormEditText) convertView.findViewById(R.id.maxperson_et);
|
|
|
convertView.setTag(tableView);
|
|
|
+
|
|
|
+ tableView.maxperson_et.setFocusable(false);
|
|
|
+ tableView.maxperson_et.setKeyListener(null);
|
|
|
tableView.type_et.setFocusable(false);
|
|
|
tableView.type_et.setKeyListener(null);
|
|
|
tableView.deskcode_et.setFocusable(false);
|
|
|
@@ -315,6 +323,12 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
|
|
|
doInput(4,position);
|
|
|
}
|
|
|
});
|
|
|
+ tableView.maxperson_et.setOnClickListener(new View.OnClickListener() {
|
|
|
+ @Override
|
|
|
+ public void onClick(View view) {
|
|
|
+ doInput(5,position);
|
|
|
+ }
|
|
|
+ });
|
|
|
|
|
|
//showdata
|
|
|
tableView.type_et.setText(modeList.get(position).getAs_type()+"");
|
|
|
@@ -326,7 +340,7 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
|
|
|
}
|
|
|
|
|
|
class TableView{
|
|
|
- FormEditText type_et,deskcode_et,number_et,remark_et,days_et;
|
|
|
+ FormEditText type_et,deskcode_et,number_et,remark_et,days_et,maxperson_et;
|
|
|
}
|
|
|
}
|
|
|
private PopupWindow popupWindow = null;
|
|
|
@@ -359,9 +373,15 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
|
|
|
}else if (type == 4){
|
|
|
editname_et.setVisibility(View.GONE);
|
|
|
editname_et2.setVisibility(View.VISIBLE);
|
|
|
- title_tv.setText("请可被预约量/天");
|
|
|
+ title_tv.setText("请输入可被预约量/天");
|
|
|
editname_et2.setHint(getString(R.string.common_input));
|
|
|
editname_et2.setText(tableList.get(position).getAs_booknumber()+"");
|
|
|
+ }else if (type == 5){
|
|
|
+ editname_et.setVisibility(View.GONE);
|
|
|
+ editname_et2.setVisibility(View.VISIBLE);
|
|
|
+ title_tv.setText("请输入最多可坐人数");
|
|
|
+ editname_et2.setHint(getString(R.string.common_input));
|
|
|
+ editname_et2.setText(tableList.get(position).getAs_maxperson()+"");
|
|
|
}
|
|
|
int w_screen = dm.widthPixels;
|
|
|
int h_screen = dm.heightPixels;
|
|
|
@@ -403,12 +423,20 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
|
|
|
}
|
|
|
}else if (type == 4){
|
|
|
if (StringUtil.isEmpty(editname_et2.getText().toString())){
|
|
|
- ToastMessage("请可被预约量/天");
|
|
|
+ ToastMessage("请输入可被预约量/天");
|
|
|
return;
|
|
|
}else {
|
|
|
tableList.get(position).setAs_booknumber(editname_et2.getText().toString());
|
|
|
myAdapter.notifyDataSetChanged();
|
|
|
}
|
|
|
+ }else if (type == 5){
|
|
|
+ if (StringUtil.isEmpty(editname_et2.getText().toString())){
|
|
|
+ ToastMessage("请输入最多可坐人数");
|
|
|
+ return;
|
|
|
+ }else {
|
|
|
+ tableList.get(position).setAs_maxperson(editname_et2.getText().toString());
|
|
|
+ myAdapter.notifyDataSetChanged();
|
|
|
+ }
|
|
|
}
|
|
|
popupWindow.dismiss();
|
|
|
}
|
raomeng